ZVISION: Merge upstream

author: Marisa-Chan 2014-11-12 16:38:28 +0600
committer: Marisa-Chan 2014-11-12 16:38:28 +0600
commit: e6f66877627ff4ef03ad8d1ea8a64c4278593d22 (patch)
tree: b3f3815c2b43e711108ea74750487738053fa7b7 /backends
parent: f43326a533faec014fb1987f9ba3729127c46487 (diff)
parent: 54a4b2fa863b5fd9469e360ecd7c4b0717b373fe (diff)
download: scummvm-rg350-e6f66877627ff4ef03ad8d1ea8a64c4278593d22.tar.gz
scummvm-rg350-e6f66877627ff4ef03ad8d1ea8a64c4278593d22.tar.bz2
scummvm-rg350-e6f66877627ff4ef03ad8d1ea8a64c4278593d22.zip
104 files changed, 1309 insertions, 1225 deletions
diff --git a/backends/audiocd/audiocd.h b/backends/audiocd/audiocd.h
index db9a15505a..6eae8e096b 100644
--- a/backends/audiocd/audiocd.h
+++ b/backends/audiocd/audiocd.h
@@ -58,8 +58,8 @@ public:
 	/**
 	 * Start audio CD playback
 	 * @param track			the track to play.
-	 * @param num_loops		how often playback should be repeated (-1 = infinitely often).
-	 * @param start_frame	the frame at which playback should start (75 frames = 1 second).
+	 * @param numLoops		how often playback should be repeated (-1 = infinitely often).
+	 * @param startFrame	the frame at which playback should start (75 frames = 1 second).
 	 * @param duration		the number of frames to play.
 	 * @param only_emulate	determines if the track should be emulated only
 	 */
diff --git a/backends/events/dinguxsdl/dinguxsdl-events.cpp b/backends/events/dinguxsdl/dinguxsdl-events.cpp
index 46089a4fcd..cc15f2666c 100644
--- a/backends/events/dinguxsdl/dinguxsdl-events.cpp
+++ b/backends/events/dinguxsdl/dinguxsdl-events.cpp
@@ -26,18 +26,48 @@
 
 #include "backends/events/dinguxsdl/dinguxsdl-events.h"
 
+#ifndef GCW0
 #define PAD_UP    SDLK_UP
 #define PAD_DOWN  SDLK_DOWN
 #define PAD_LEFT  SDLK_LEFT
 #define PAD_RIGHT SDLK_RIGHT
 #define BUT_A     SDLK_LCTRL
 #define BUT_B     SDLK_LALT
-#define BUT_X     SDLK_SPACE
-#define BUT_Y     SDLK_LSHIFT
+#define BUT_X     SDLK_SPACE       // BUT_Y in GCW0
+#define BUT_Y     SDLK_LSHIFT      // BUT_X in GCW0
 #define BUT_SELECT   SDLK_ESCAPE
 #define BUT_START    SDLK_RETURN
 #define TRIG_L    SDLK_TAB
 #define TRIG_R    SDLK_BACKSPACE
+#else // GCW0
+
+/******
+ * GCW0 keymap
+ *                      Dingoo button
+ * A -> Left Button     BUT_Y
+ * B -> right button    BUT_B
+ * X -> ' '             BUT_A '0'
+ * Y -> '.'             BUT_X
+ * Select -> ESC        TRIG_R
+ * Start -> F5          TRIG_L
+ * L -> Shift           BUT_START
+ * R -> VK              BUT_SELECT
+ */
+
+#define PAD_UP    SDLK_UP
+#define PAD_DOWN  SDLK_DOWN
+#define PAD_LEFT  SDLK_LEFT
+#define PAD_RIGHT SDLK_RIGHT
+#define BUT_A     SDLK_LSHIFT
+#define BUT_B     SDLK_LALT
+#define BUT_X     SDLK_SPACE
+#define BUT_Y     SDLK_LCTRL
+#define BUT_SELECT   SDLK_BACKSPACE
+#define BUT_START    SDLK_TAB
+#define TRIG_L    SDLK_RETURN
+#define TRIG_R    SDLK_ESCAPE
+
+#endif
 
 bool DINGUXSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 	if (ev.key.keysym.sym == PAD_UP) {
@@ -144,8 +174,9 @@ bool DINGUXSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 
 		return true;
 	} else if (ev.key.keysym.sym == BUT_SELECT) { // virtual keyboard
-		ev.key.keysym.sym = SDLK_F7;
-
+#ifdef ENABLE_VKEYBD
+		event.type = Common::EVENT_VIRTUAL_KEYBOARD;
+#endif
 	} else if (ev.key.keysym.sym == BUT_START) { // F5, menu in some games
 		ev.key.keysym.sym = SDLK_F5;
 
diff --git a/backends/events/gph/gph-events.cpp b/backends/events/gph/gph-events.cpp
index 90b6a2a29d..88fc97d3d1 100644
--- a/backends/events/gph/gph-events.cpp
+++ b/backends/events/gph/gph-events.cpp
@@ -348,8 +348,7 @@ bool GPHEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) {
 		event.type = Common::EVENT_KEYDOWN;
 		if (BUTTON_STATE_L == true) {
 #ifdef ENABLE_VKEYBD
-			event.kbd.keycode = Common::KEYCODE_F7;
-			event.kbd.ascii = mapKey(SDLK_F7, ev.key.keysym.mod, 0);
+			event.type = Common::EVENT_VIRTUAL_KEYBOARD;
 #else
 			event.kbd.keycode = Common::KEYCODE_0;
 			event.kbd.ascii = mapKey(SDLK_0, ev.key.keysym.mod, 0);
diff --git a/backends/events/linuxmotosdl/linuxmotosdl-events.cpp b/backends/events/linuxmotosdl/linuxmotosdl-events.cpp
index ce34662612..b0d443ff9f 100644
--- a/backends/events/linuxmotosdl/linuxmotosdl-events.cpp
+++ b/backends/events/linuxmotosdl/linuxmotosdl-events.cpp
@@ -73,7 +73,10 @@ bool LinuxmotoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 	}
 	// VirtualKeyboard - Camera key
 	else if (ev.key.keysym.sym == SDLK_PAUSE) {
-		ev.key.keysym.sym = SDLK_F7;
+#ifdef ENABLE_VKEYBD
+                event.type = Common::EVENT_VIRTUAL_KEYBOARD;
+                return true;
+#endif
 	}
 	// Enter - mod+fire key
 	else if (ev.key.keysym.sym == SDLK_b) {
@@ -117,7 +120,10 @@ bool LinuxmotoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 	}
 	// VirtualKeyboard - Right Soft key
 	else if (ev.key.keysym.sym == SDLK_F11) {
-		ev.key.keysym.sym = SDLK_F7;
+#ifdef ENABLE_VKEYBD
+                event.type = Common::EVENT_VIRTUAL_KEYBOARD;
+                return true;
+#endif
 	}
 #endif
 
diff --git a/backends/events/maemosdl/maemosdl-events.cpp b/backends/events/maemosdl/maemosdl-events.cpp
index 5045363286..8b7514004a 100644
--- a/backends/events/maemosdl/maemosdl-events.cpp
+++ b/backends/events/maemosdl/maemosdl-events.cpp
@@ -86,12 +86,11 @@ bool MaemoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 				return true;
 			} else if (ev.key.keysym.sym == SDLK_F6) {
 				if (!model.hasHwKeyboard) {
-					event.type = Common::EVENT_KEYDOWN;
-					event.kbd.keycode = Common::KEYCODE_F7;
-					event.kbd.ascii = Common::ASCII_F7;
-					event.kbd.flags = 0;
-					debug(9, "remapping to F7 down (virtual keyboard)");
+#ifdef ENABLE_VKEYBD
+					event.type = Common::EVENT_VIRTUAL_KEYBOARD;
+					debug(9, "remapping to virtual keyboard trigger");
 					return true;
+#endif
 				} else {
 					// handled in keyup
 				}
@@ -102,12 +101,11 @@ bool MaemoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 				return true;
 			} else if (ev.key.keysym.sym == SDLK_F8) {
 				if (ev.key.keysym.mod & KMOD_CTRL) {
-					event.type = Common::EVENT_KEYDOWN;
-					event.kbd.keycode = Common::KEYCODE_F7;
-					event.kbd.ascii = Common::ASCII_F7;
-					event.kbd.flags = 0;
-					debug(9, "remapping to F7 down (virtual keyboard)");
+#ifdef ENABLE_VKEYBD
+					event.type = Common::EVENT_VIRTUAL_KEYBOARD;
+					debug(9, "remapping to virtual keyboard trigger");
 					return true;
+#endif
 				} else {
 					// handled in keyup
 					return true;
@@ -125,12 +123,7 @@ bool MaemoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 				return true;
 			} else if (ev.key.keysym.sym == SDLK_F6) {
 				if (!model.hasHwKeyboard) {
-					event.type = Common::EVENT_KEYUP;
-					event.kbd.keycode = Common::KEYCODE_F7;
-					event.kbd.ascii = Common::ASCII_F7;
-					event.kbd.flags = 0;
-					debug(9, "remapping to F7 down (virtual keyboard)");
-					return true;
+					// handled in keydown
 				} else {
 					bool currentState = ((OSystem_SDL *)g_system)->getGraphicsManager()->getFeatureState(OSystem::kFeatureFullscreenMode);
 					g_system->beginGFXTransaction();
@@ -146,12 +139,7 @@ bool MaemoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 				return true;
 			} else if (ev.key.keysym.sym == SDLK_F8) {
 				if (ev.key.keysym.mod & KMOD_CTRL) {
-					event.type = Common::EVENT_KEYUP;
-					event.kbd.keycode = Common::KEYCODE_F7;
-					event.kbd.ascii = Common::ASCII_F7;
-					event.kbd.flags = 0;
-					debug(9, "remapping to F7 up (virtual keyboard)");
-					return true;
+					// handled in key down
 				} else {
 					toggleClickMode();
 					debug(9, "remapping to click toggle");
diff --git a/backends/events/ps3sdl/ps3sdl-events.cpp b/backends/events/ps3sdl/ps3sdl-events.cpp
index 1a854436f1..0f6e01857b 100644
--- a/backends/events/ps3sdl/ps3sdl-events.cpp
+++ b/backends/events/ps3sdl/ps3sdl-events.cpp
@@ -72,9 +72,9 @@ bool PS3SdlEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event)
 		event.kbd.ascii = mapKey(SDLK_F5, (SDLMod) ev.key.keysym.mod, 0);
 		break;
 	case BTN_SELECT: // Virtual keyboard
-		event.type = Common::EVENT_KEYDOWN;
-		event.kbd.keycode = Common::KEYCODE_F7;
-		event.kbd.ascii = mapKey(SDLK_F7, (SDLMod) ev.key.keysym.mod, 0);
+#ifdef ENABLE_VKEYBD
+		event.type = Common::EVENT_VIRTUAL_KEYBOARD;
+#endif
 		break;
 	case BTN_SQUARE: // Escape
 		event.type = Common::EVENT_KEYDOWN;
@@ -110,9 +110,7 @@ bool PS3SdlEventSource::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) {
 		event.kbd.ascii = mapKey(SDLK_F5, (SDLMod) ev.key.keysym.mod, 0);
 		break;
 	case BTN_SELECT: // Virtual keyboard
-		event.type = Common::EVENT_KEYUP;
-		event.kbd.keycode = Common::KEYCODE_F7;
-		event.kbd.ascii = mapKey(SDLK_F7, (SDLMod) ev.key.keysym.mod, 0);
+		// Handled in key down
 		break;
 	case BTN_SQUARE: // Escape
 		event.type = Common::EVENT_KEYUP;
diff --git a/backends/events/samsungtvsdl/samsungtvsdl-events.cpp b/backends/events/samsungtvsdl/samsungtvsdl-events.cpp
index f5b919a060..61499b566d 100644
--- a/backends/events/samsungtvsdl/samsungtvsdl-events.cpp
+++ b/backends/events/samsungtvsdl/samsungtvsdl-events.cpp
@@ -38,10 +38,10 @@ bool SamsungTVSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 				event.kbd.ascii = Common::ASCII_F5;
 				return true;
 			} else if (ev.key.keysym.sym == SDLK_F2 && ev.key.keysym.scancode == 21) {
-				event.type = Common::EVENT_KEYDOWN;
-				event.kbd.keycode = Common::KEYCODE_F7;
-				event.kbd.ascii = Common::ASCII_F7;
+#ifdef ENABLE_VKEYBD
+				event.type = Common::EVENT_VIRTUAL_KEYBOARD;
 				return true;
+#endif
 			}
 			break;
 		}
@@ -54,11 +54,6 @@ bool SamsungTVSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 				event.kbd.keycode = Common::KEYCODE_F5;
 				event.kbd.ascii = Common::ASCII_F5;
 				return true;
-			} else if (ev.key.keysym.sym == SDLK_F2 && ev.key.keysym.scancode == 21) {
-				event.type = Common::EVENT_KEYUP;
-				event.kbd.keycode = Common::KEYCODE_F7;
-				event.kbd.ascii = Common::ASCII_F7;
-				return true;
 			}
 			break;
 		}
diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp
index 5a66cdaa2f..7bebdf8ce6 100644
--- a/backends/fs/amigaos4/amigaos4-fs.cpp
+++ b/backends/fs/amigaos4/amigaos4-fs.cpp
@@ -62,7 +62,7 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode() {
 	_bIsDirectory = true;
 	_sPath = "";
 	_pFileLock = 0;
-	_nProt = 0; // protection is ignored for the root volume
+	_nProt = 0; // Protection is ignored for the root volume
 	LEAVE();
 }
 
@@ -84,7 +84,7 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(const Common::String &p) {
 	_bIsDirectory = false;
 	_bIsValid = false;
 
-	// Check whether the node exists and if it is a directory
+	// Check whether the node exists and if it's a directory
 	struct ExamineData * pExd = IDOS->ExamineObjectTags(EX_StringNameInput,_sPath.c_str(),TAG_END);
 	if (pExd) {
 		_nProt = pExd->Protection;
@@ -93,7 +93,7 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(const Common::String &p) {
 			_pFileLock = IDOS->Lock((CONST_STRPTR)_sPath.c_str(), SHARED_LOCK);
 			_bIsValid = (_pFileLock != 0);
 
-			// Add a trailing slash if it is needed
+			// Add a trailing slash if needed
 			const char c = _sPath.lastChar();
 			if (c != '/' && c != ':')
 				_sPath += '/';
@@ -134,7 +134,7 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(BPTR pLock, const char *pDisplayNam
 		delete[] n;
 	}
 
-	_bIsValid =	false;
+	_bIsValid = false;
 	_bIsDirectory = false;
 
 	struct ExamineData * pExd = IDOS->ExamineObjectTags(EX_FileLockInput,pLock,TAG_END);
@@ -188,10 +188,10 @@ bool AmigaOSFilesystemNode::exists() const {
 
 	bool nodeExists = false;
 
-	// previously we were trying to examine the node in order
+	// Previously we were trying to examine the node in order
 	// to determine if the node exists or not.
 	// I don't see the point : once you have been granted a
-	// lock on it then it means it exists...
+	// lock on it, it means it exists...
 	//
 	// =============================  Old code
 	// BPTR pLock = IDOS->Lock((STRPTR)_sPath.c_str(), SHARED_LOCK);
@@ -237,8 +237,8 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b
 	ENTER();
 	bool ret = false;
 
-	//TODO: honor the hidden flag
-	// There is nothing like a hidden flag under AmigaOS...
+	// TODO: Honor the hidden flag
+	// There is no such thing as a hidden flag in AmigaOS...
 
 	if (!_bIsValid) {
 		debug(6, "Invalid node");
@@ -252,7 +252,7 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b
 		return false; // Empty list
 	}
 
-	if (_pFileLock == 0) {
+	if (isRootNode()) {
 		debug(6, "Root node");
 		LEAVE();
 		myList = listVolumes();
@@ -264,7 +264,7 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b
 												EX_DataFields,		(EXF_NAME|EXF_LINK|EXF_TYPE),
 												TAG_END);
 	if (context) {
-		struct ExamineData * pExd = NULL; // NB: no need to free value after usage, all is dealt by the DirContext release
+		struct ExamineData * pExd = NULL; // NB: No need to free the value after usage, everything will be dealt with by the DirContext release
 
 		AmigaOSFilesystemNode *entry ;
 		while ( (pExd = IDOS->ExamineDir(context)) ) {
@@ -307,21 +307,33 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b
 AbstractFSNode *AmigaOSFilesystemNode::getParent() const {
 	ENTER();
 
-	if (_pFileLock == 0) {
+	if (isRootNode()) {
 		debug(6, "Root node");
 		LEAVE();
 		return new AmigaOSFilesystemNode(*this);
 	}
 
+	BPTR pLock = _pFileLock;
+
+	if (!_bIsDirectory) {
+		assert(!pLock);
+		pLock = IDOS->Lock((CONST_STRPTR)_sPath.c_str(), SHARED_LOCK);
+		assert(pLock);
+	}
+
 	AmigaOSFilesystemNode *node;
 
-	BPTR parentDir = IDOS->ParentDir( _pFileLock );
+	BPTR parentDir = IDOS->ParentDir( pLock );
 	if (parentDir) {
 		node = new AmigaOSFilesystemNode(parentDir);
 		IDOS->UnLock(parentDir);
 	} else
 		node = new AmigaOSFilesystemNode();
 
+	if (!_bIsDirectory) {
+		IDOS->UnLock(pLock);
+	}
+
 	LEAVE();
 
 	return node;
@@ -332,9 +344,9 @@ bool AmigaOSFilesystemNode::isReadable() const {
 		return false;
 
 	// Regular RWED protection flags are low-active or inverted, thus the negation.
-	// moreover pseudo root filesystem (null _pFileLock) is readable whatever the
-	// protection says
-	bool readable = !(_nProt & EXDF_OTR_READ) || _pFileLock == 0;
+	// Moreover, a pseudo root filesystem is readable whatever the
+	// protection says.
+	bool readable = !(_nProt & EXDF_OTR_READ) || isRootNode();
 
 	return readable;
 }
@@ -344,9 +356,9 @@ bool AmigaOSFilesystemNode::isWritable() const {
 		return false;
 
 	// Regular RWED protection flags are low-active or inverted, thus the negation.
-	// moreover pseudo root filesystem (null _pFileLock) is never writable whatever
-	// the protection says (because of the pseudo nature)
-	bool writable = !(_nProt & EXDF_OTR_WRITE) && _pFileLock !=0;
+	// Moreover, a pseudo root filesystem is never writable whatever
+	// the protection says (Because of it's pseudo nature).
+	bool writable = !(_nProt & EXDF_OTR_WRITE) && !isRootNode();
 
 	return writable;
 }
@@ -371,12 +383,13 @@ AbstractFSList AmigaOSFilesystemNode::listVolumes() const {
 		if (dosList->dol_Type == DLT_VOLUME &&
 			dosList->dol_Name) {
 
-			// Original was
-			// dosList->dol_Name &&
-			// dosList->dol_Task) {
+			// The original line was
+			//if (dosList->dol_Type == DLT_VOLUME &&
+			//dosList->dol_Name &&
+			//dosList->dol_Task) {
 			// which errored using SDK 53.24 with a 'struct dosList' has no member called 'dol_Task'
 			// I removed dol_Task because it's not used anywhere else
-			// and it neither brought up further errors nor crashes or regressions.
+			// and it neither brought up further errors nor crashes or regressions
 
 			// Copy name to buffer
 			IDOS->CopyStringBSTRToC(dosList->dol_Name, buffer, MAXPATHLEN);
@@ -410,7 +423,7 @@ AbstractFSList AmigaOSFilesystemNode::listVolumes() const {
 
 			delete[] volName;
 		}
-		dosList	= IDOS->NextDosEntry(dosList, LDF_VOLUMES);
+		dosList = IDOS->NextDosEntry(dosList, LDF_VOLUMES);
 	}
 
 	IDOS->UnLockDosList(kLockFlags);
diff --git a/backends/fs/amigaos4/amigaos4-fs.h b/backends/fs/amigaos4/amigaos4-fs.h
index bbe88b2716..408354888e 100644
--- a/backends/fs/amigaos4/amigaos4-fs.h
+++ b/backends/fs/amigaos4/amigaos4-fs.h
@@ -62,6 +62,11 @@ protected:
 	 */
 	virtual AbstractFSList listVolumes() const;
 
+	/**
+	 * True if this is the pseudo root filesystem.
+	 */
+	bool isRootNode() const { return _bIsValid && _bIsDirectory && _pFileLock == 0; }
+
 public:
 	/**
 	 * Creates an AmigaOSFilesystemNode with the root node as path.
@@ -76,19 +81,19 @@ public:
 	AmigaOSFilesystemNode(const Common::String &p);
 
 	/**
-	 * Creates an AmigaOSFilesystemNode given its lock and display name
+	 * Creates an AmigaOSFilesystemNode given its lock and display name.
 	 *
 	 * @param pLock BPTR to the lock.
 	 * @param pDisplayName name to be used for display, in case not supplied the FilePart() of the filename will be used.
 	 *
-	 * @note This shouldn't even be public as it's only internally, at best it should have been protected if not private
+	 * @note This shouldn't even be public as it's only internally, at best it should have been protected if not private.
 	 */
 	AmigaOSFilesystemNode(BPTR pLock, const char *pDisplayName = 0);
 
 	/**
 	 * Copy constructor.
 	 *
-	 * @note Needed because it duplicates the file lock
+	 * @note Needed because it duplicates the file lock.
 	 */
 	AmigaOSFilesystemNode(const AmigaOSFilesystemNode &node);
 
diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index cbd06e9161..c455c4ce2e 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -489,7 +489,7 @@ void OpenGLGraphicsManager::warpMouse(int x, int y) {
 		if (!_overlay) {
 			return;
 		}
-	
+
 		// It might be confusing that we actually have to handle something
 		// here when the overlay is visible. This is because for very small
 		// resolutions we have a minimal overlay size and have to adjust
@@ -1044,8 +1044,8 @@ void OpenGLGraphicsManager::recalculateDisplayArea() {
 	}
 
 	// We center the screen in the middle for now.
-	_displayX = (_outputScreenWidth  - _displayWidth ) / 2; 
-	_displayY = (_outputScreenHeight - _displayHeight) / 2; 
+	_displayX = (_outputScreenWidth  - _displayWidth ) / 2;
+	_displayY = (_outputScreenHeight - _displayHeight) / 2;
 }
 
 void OpenGLGraphicsManager::updateCursorPalette() {
diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h
index d16f92d148..dde21533b0 100644
--- a/backends/graphics/opengl/opengl-graphics.h
+++ b/backends/graphics/opengl/opengl-graphics.h
@@ -131,7 +131,7 @@ protected:
 	 *
 	 * @param defaultFormat      The new default format for the game screen
 	 *                           (this is used for the CLUT8 game screens).
-	 * @param defaultFromatAlpha The new default format with an alpha channel
+	 * @param defaultFormatAlpha The new default format with an alpha channel
 	 *                           (this is used for the overlay and cursor).
 	 */
 	void notifyContextCreate(const Graphics::PixelFormat &defaultFormat, const Graphics::PixelFormat &defaultFormatAlpha);
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index 3f42d62a3a..b028cd5b1a 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -282,7 +282,7 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
 			if (!_fullscreenVideoModes.empty()) {
 				VideoModeArray::const_iterator i = _fullscreenVideoModes.end();
 				--i;
-	
+
 				_desiredFullscreenWidth  = i->width;
 				_desiredFullscreenHeight = i->height;
 			} else {
@@ -311,7 +311,6 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
 			SDL_Delay(10);
 		}
 	}
-	_lastVideoModeLoad = curTime;
 
 	uint32 flags = SDL_OPENGL;
 	if (_wantsFullScreen) {
@@ -338,6 +337,9 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
 		}
 	}
 
+	// Part of the WORKAROUND mentioned above.
+	_lastVideoModeLoad = SDL_GetTicks();
+
 	if (_hwScreen) {
 		// This is pretty confusing since RGBA8888 talks about the memory
 		// layout here. This is a different logical layout depending on
@@ -354,10 +356,11 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
 		setActualScreenSize(_hwScreen->w, _hwScreen->h);
 	}
 
-	// Ignore resize events (from SDL) for a few frames. This avoids
-	// bad resizes to a (former) resolution for which we haven't
-	// processed an event yet.
-	_ignoreResizeEvents = 10;
+	// Ignore resize events (from SDL) for a few frames, if this isn't
+	// caused by a notification from SDL. This avoids bad resizes to a
+	// (former) resolution for which we haven't processed an event yet.
+	if (!_gotResize)
+		_ignoreResizeEvents = 10;
 
 	return _hwScreen != nullptr;
 }
diff --git a/backends/keymapper/action.h b/backends/keymapper/action.h
index ed4bb86ce6..17b1153c77 100644
--- a/backends/keymapper/action.h
+++ b/backends/keymapper/action.h
@@ -37,7 +37,7 @@ namespace Common {
 struct HardwareInput;
 class Keymap;
 
-#define ACTION_ID_SIZE (4)
+#define ACTION_ID_SIZE (5)
 
 struct KeyActionEntry {
 	const KeyState ks;
diff --git a/backends/mixer/sdl/sdl-mixer.cpp b/backends/mixer/sdl/sdl-mixer.cpp
index 7c709e91a3..e3b15b8c59 100644
--- a/backends/mixer/sdl/sdl-mixer.cpp
+++ b/backends/mixer/sdl/sdl-mixer.cpp
@@ -33,9 +33,8 @@
 #ifdef GP2X
 #define SAMPLES_PER_SEC 11025
 #else
-#define SAMPLES_PER_SEC 22050
+#define SAMPLES_PER_SEC 44100
 #endif
-//#define SAMPLES_PER_SEC 44100
 
 SdlMixerManager::SdlMixerManager()
 	:
diff --git a/backends/mixer/sdl13/sdl13-mixer.cpp b/backends/mixer/sdl13/sdl13-mixer.cpp
index f9894a6f91..dc38242bde 100644
--- a/backends/mixer/sdl13/sdl13-mixer.cpp
+++ b/backends/mixer/sdl13/sdl13-mixer.cpp
@@ -33,9 +33,8 @@
 #ifdef GP2X
 #define SAMPLES_PER_SEC 11025
 #else
-#define SAMPLES_PER_SEC 22050
+#define SAMPLES_PER_SEC 44100
 #endif
-//#define SAMPLES_PER_SEC 44100
 
 Sdl13MixerManager::Sdl13MixerManager()
 	:
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 7c4fe01d54..69aa9d8303 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -26,13 +26,10 @@ PATH_RESOURCES = $(PATH_DIST)/res
 
 PORT_DISTFILES = $(PATH_DIST)/README.Android
 
-# FIXME: OUYA specific.
-#        "values-television" not present in vanilla Android.
-# $(PATH_RESOURCES)/../res-ouya/values-television/margins.xml \
-
 RESOURCES = \
 	$(PATH_RESOURCES)/values/strings.xml \
 	$(PATH_RESOURCES)/values/margins.xml \
+	$(PATH_RESOURCES)/values-television/margins.xml \
 	$(PATH_RESOURCES)/layout/main.xml \
 	$(PATH_RESOURCES)/layout/splash.xml \
 	$(PATH_RESOURCES)/drawable/gradient.xml \
@@ -48,10 +45,10 @@ PLUGIN_RESOURCES = \
 #LDFLAGS += -Wl,--gc-sections
 #CXXFLAGS += -ffunction-sections -fdata-sections -fvisibility=hidden -fvisibility-inlines-hidden
 
-AAPT = $(ANDROID_SDK)/platform-tools/aapt
+AAPT = $(ANDROID_SDK)/$(ANDROID_BTOOLS)/aapt
 ADB = $(ANDROID_SDK)/platform-tools/adb
-DX = $(ANDROID_SDK)/platform-tools/dx
-APKBUILDER = $(ANDROID_SDK)/tools/apkbuilder
+DX = $(ANDROID_SDK)/$(ANDROID_BTOOLS)/dx
+APKBUILDER = java -Xmx128M -classpath $(ANDROID_SDK)/tools/lib/sdklib.jar com.android.sdklib.build.ApkBuilderMain
 JAVAC ?= javac
 JAVACFLAGS = -source 1.5 -target 1.5
 
diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp
index c60626ec36..8039981a92 100644
--- a/backends/platform/android/events.cpp
+++ b/backends/platform/android/events.cpp
@@ -263,7 +263,7 @@ void OSystem_Android::setupKeymapper() {
 	Action *act;
 
 	act = new Action(globalMap, "VIRT", "Display keyboard");
-	act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, 0));
+	act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, KBD_CTRL));
 
 	mapper->addGlobalKeymap(globalMap);
 
diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
index 5964d5bfde..f4eb7ddd0b 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
@@ -3,6 +3,7 @@ package org.scummvm.scummvm;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.media.AudioManager;
 import android.os.Build;
 import android.os.Bundle;
@@ -201,6 +202,7 @@ public class ScummVMActivity extends Activity {
 
 		if (_scummvm != null)
 			_scummvm.setPause(false);
+		showMouseCursor(false);
 	}
 
 	@Override
@@ -211,6 +213,7 @@ public class ScummVMActivity extends Activity {
 
 		if (_scummvm != null)
 			_scummvm.setPause(true);
+		showMouseCursor(true);
 	}
 
 	@Override
@@ -267,4 +270,15 @@ public class ScummVMActivity extends Activity {
 			imm.hideSoftInputFromWindow(main_surface.getWindowToken(),
 										InputMethodManager.HIDE_IMPLICIT_ONLY);
 	}
+
+	private void showMouseCursor(boolean show) {
+		/* Currently hiding the system mouse cursor is only
+		   supported on OUYA.  If other systems provide similar
+		   intents, please add them here as well */
+		Intent intent =
+			new Intent(show?
+				   "tv.ouya.controller.action.SHOW_CURSOR" :
+				   "tv.ouya.controller.action.HIDE_CURSOR");
+		sendBroadcast(intent);
+	}
 }
diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk
index e0aca42856..1333e89ff8 100644
--- a/backends/platform/dingux/dingux.mk
+++ b/backends/platform/dingux/dingux.mk
@@ -1,6 +1,7 @@
 DINGUX_EXE_STRIPPED := scummvm_stripped$(EXEEXT)
 
 bundle_name = dingux-dist/scummvm
+gcw0_bundle = gcw0-opk
 
 all: $(DINGUX_EXE_STRIPPED)
 
@@ -26,6 +27,41 @@ ifdef DYNAMIC_MODULES
 		$(STRIP) $(bundle_name)/plugins/*
 endif
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)/
 	$(CP) $(srcdir)/backends/platform/dingux/scummvm.gpe $(bundle_name)/
 	$(CP) $(srcdir)/backends/platform/dingux/README.DINGUX $(bundle_name)/
 	$(CP) $(srcdir)/backends/platform/dingux/scummvm.png $(bundle_name)/
+
+# Special target for generationg GCW-Zero OPK bundle
+$(gcw0_bundle): all
+	$(MKDIR) $(gcw0_bundle)
+	$(CP) $(DIST_FILES_DOCS) $(gcw0_bundle)/
+	$(MKDIR) $(gcw0_bundle)/themes
+	$(CP) $(DIST_FILES_THEMES) $(gcw0_bundle)/themes/
+ifdef DIST_FILES_ENGINEDATA
+	$(MKDIR) $(gcw0_bundle)/engine-data
+	$(CP) $(DIST_FILES_ENGINEDATA) $(gcw0_bundle)/engine-data/
+endif
+ifdef DYNAMIC_MODULES
+	$(MKDIR) $(gcw0_bundle)/plugins
+	$(CP) $(PLUGINS) $(gcw0_bundle)/plugins/
+endif
+	$(CP) $(EXECUTABLE) $(gcw0_bundle)/scummvm
+
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(gcw0_bundle)/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(gcw0_bundle)/
+
+	$(CP) $(srcdir)/dists/gcw0/scummvm.png $(gcw0_bundle)/
+	$(CP) $(srcdir)/dists/gcw0/default.gcw0.desktop $(gcw0_bundle)/
+	$(CP) $(srcdir)/dists/gcw0/scummvmrc $(gcw0_bundle)/
+	$(CP) $(srcdir)/dists/gcw0/scummvm.sh $(gcw0_bundle)/
+
+gcw0-opk-unstripped: $(gcw0_bundle)
+	$(CP) $(PLUGINS) $(gcw0_bundle)/plugins/
+	$(CP) $(EXECUTABLE) $(gcw0_bundle)/scummvm
+	./dists/gcw0/opk_make.sh -d $(gcw0_bundle) -o scummvm
+
+gcw-opk: $(gcw0_bundle)
+	$(STRIP) $(gcw0_bundle)/plugins/*
+	$(STRIP) $(gcw0_bundle)/scummvm
+	./dists/gcw0/opk_make.sh -d $(gcw0_bundle) -o scummvm
diff --git a/backends/platform/gph/caanoo-bundle.mk b/backends/platform/gph/caanoo-bundle.mk
index 2cf8e62b37..9362daeba3 100644
--- a/backends/platform/gph/caanoo-bundle.mk
+++ b/backends/platform/gph/caanoo-bundle.mk
@@ -24,6 +24,7 @@ caanoo-bundle: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)/scummvm/
 
 	$(STRIP) $(EXECUTABLE) -o $(bundle_name)/scummvm/$(EXECUTABLE)
 
@@ -55,6 +56,7 @@ caanoo-bundle-debug: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)/scummvm/
 
 	$(INSTALL) -c -m 777 $(srcdir)/$(EXECUTABLE) $(bundle_name)/scummvm/$(EXECUTABLE)
 
diff --git a/backends/platform/gph/gp2x-bundle.mk b/backends/platform/gph/gp2x-bundle.mk
index 9fcb379e04..d430ae6ebe 100644
--- a/backends/platform/gph/gp2x-bundle.mk
+++ b/backends/platform/gph/gp2x-bundle.mk
@@ -21,6 +21,7 @@ gp2x-bundle: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/engine-data
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)
 
 	$(STRIP) $(EXECUTABLE) -o $(bundle_name)/$(EXECUTABLE)
 
@@ -52,6 +53,7 @@ gp2x-bundle-debug: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/engine-data
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)
 
 	$(INSTALL) -c -m 777 $(srcdir)/$(EXECUTABLE) $(bundle_name)/$(EXECUTABLE)
 
diff --git a/backends/platform/gph/gp2xwiz-bundle.mk b/backends/platform/gph/gp2xwiz-bundle.mk
index 4f49850813..36a720aae6 100644
--- a/backends/platform/gph/gp2xwiz-bundle.mk
+++ b/backends/platform/gph/gp2xwiz-bundle.mk
@@ -23,6 +23,7 @@ gp2xwiz-bundle: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)/scummvm/
 
 	$(STRIP) $(EXECUTABLE) -o $(bundle_name)/scummvm/$(EXECUTABLE)
 
@@ -57,6 +58,7 @@ gp2xwiz-bundle-debug: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)/scummvm/
 
 	$(INSTALL) -c -m 777 $(srcdir)/$(EXECUTABLE) $(bundle_name)/scummvm/$(EXECUTABLE)
 
diff --git a/backends/platform/linuxmoto/linuxmoto.mk b/backends/platform/linuxmoto/linuxmoto.mk
index f64fadbccd..937fb4ef69 100644
--- a/backends/platform/linuxmoto/linuxmoto.mk
+++ b/backends/platform/linuxmoto/linuxmoto.mk
@@ -5,6 +5,7 @@ motoezx: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) release/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS)  release/scummvm/
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip release/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip release/scummvm/
 	$(CP) $(srcdir)/dists/motoezx/* release/scummvm/
 	tar -C release -cvzf release/ScummVM-motoezx.pkg scummvm
 	$(RM) -r release/scummvm
@@ -16,6 +17,7 @@ motomagx-mpkg: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) release/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS)  release/scummvm/
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip release/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip release/scummvm/
 	$(CP) $(srcdir)/dists/motomagx/mpkg/* release/scummvm/
 	tar -C release -cvzf release/ScummVM-motomagx.mpkg scummvm
 	$(RM) -r release/scummvm
@@ -26,6 +28,7 @@ motomagx-mgx: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) release/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS)  release/scummvm/
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip release/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip release/scummvm/
 	$(CP) $(srcdir)/dists/motomagx/mgx/* release/scummvm/
 	tar -C release -cvf release/ScummVM-motomagx.mgx scummvm
 	$(RM) -r release/scummvm
@@ -38,6 +41,7 @@ motomagx-pep: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) release/pep/app
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS)  release/pep/app
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip release/pep/app
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip release/pep/app
 	tar -C release/pep -czvf release/ScummVM-motomagx.pep app description.ini  scummvm_big_usr.png  scummvm_small_usr.png
 	$(RM) -r release/pep
 
diff --git a/backends/platform/maemo/debian/changelog b/backends/platform/maemo/debian/changelog
index 568edd0282..49e8de69d6 100644
--- a/backends/platform/maemo/debian/changelog
+++ b/backends/platform/maemo/debian/changelog
@@ -1,8 +1,8 @@
-scummvm (1.7.0~git) unstable; urgency=low
+scummvm (1.7.0) unstable; urgency=low
 
-  * Development snapshot
+  * 1.7.0 release
 
- -- Tarek Soliman <tsoliman@scummvm.org>  Sat, 01 Jun 2013 21:03:52 -0500
+ -- Tarek Soliman <tsoliman@scummvm.org>  Mon, 21 Jul 2014 23:24:12 +0100
 
 scummvm (1.6.0) unstable; urgency=low
 
diff --git a/backends/platform/maemo/debian/rules b/backends/platform/maemo/debian/rules
index c713403876..2aa7f339c9 100755
--- a/backends/platform/maemo/debian/rules
+++ b/backends/platform/maemo/debian/rules
@@ -46,6 +46,7 @@ install: build
 	install -m0644 dists/pred.dic debian/scummvm/opt/scummvm/share
 	install -m0644 gui/themes/scummclassic.zip  gui/themes/scummmodern.zip debian/scummvm/opt/scummvm/share
 	install -m0644 backends/vkeybd/packs/vkeybd_default.zip debian/scummvm/opt/scummvm/share
+	install -m0644 backends/vkeybd/packs/vkeybd_small.zip debian/scummvm/opt/scummvm/share
 # for optified version we can also add engine datafiles
 	install -m0644 dists/engine-data/drascula.dat dists/engine-data/hugo.dat dists/engine-data/kyra.dat dists/engine-data/lure.dat dists/engine-data/queen.tbl dists/engine-data/sky.cpt dists/engine-data/teenagent.dat dists/engine-data/tony.dat dists/engine-data/toon.dat debian/scummvm/opt/scummvm/share
 
diff --git a/backends/platform/n64/n64.mk b/backends/platform/n64/n64.mk
index 83ad405503..3198170788 100644
--- a/backends/platform/n64/n64.mk
+++ b/backends/platform/n64/n64.mk
@@ -20,6 +20,7 @@ ifdef DIST_FILES_ENGINEDATA
 endif
 	$(CP) $(DIST_FILES_DOCS) $(bundle_name)/
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/romfs
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)/romfs
 	genromfs -f $(bundle_name)/romfs.img -d $(bundle_name)/romfs -V scummvmn64
 	mips64-objcopy $(EXECUTABLE) $(bundle_name)/scummvm.elf -O binary
 	cat $(N64SDK)/hkz-libn64/bootcode $(bundle_name)/scummvm.elf $(bundle_name)/romfs.img > scummvm.v64
diff --git a/backends/platform/psp/README.PSP b/backends/platform/psp/README.PSP
index 18833d9f23..d92202bf4e 100644
--- a/backends/platform/psp/README.PSP
+++ b/backends/platform/psp/README.PSP
@@ -1,4 +1,4 @@
-ScummVM-PSP 1.7.0git README
+ScummVM-PSP 1.8.0git README
 ==============================================================================
 
 Installation
diff --git a/backends/platform/sdl/amigaos/amigaos-main.cpp b/backends/platform/sdl/amigaos/amigaos-main.cpp
index 0743b3f9a0..65da6bbf85 100644
--- a/backends/platform/sdl/amigaos/amigaos-main.cpp
+++ b/backends/platform/sdl/amigaos/amigaos-main.cpp
@@ -30,6 +30,9 @@
 
 int main(int argc, char *argv[]) {
 
+	// Set up a stack cookie to avoid crashes due to too few stack set by users 
+	static const char *stack_cookie __attribute__((used)) = "$STACK: 600000";
+
 	// Create our OSystem instance
 	g_system = new OSystem_AmigaOS();
 	assert(g_system);
diff --git a/backends/platform/sdl/amigaos/amigaos.mk b/backends/platform/sdl/amigaos/amigaos.mk
new file mode 100644
index 0000000000..5cec9c1588
--- /dev/null
+++ b/backends/platform/sdl/amigaos/amigaos.mk
@@ -0,0 +1,13 @@
+# Special target to create an AmigaOS snapshot installation
+amigaosdist: $(EXECUTABLE)
+	mkdir -p $(AMIGAOSPATH)
+	mkdir -p $(AMIGAOSPATH)/themes
+	mkdir -p $(AMIGAOSPATH)/extras
+	$(STRIP) $(EXECUTABLE) -o $(AMIGAOSPATH)/$(EXECUTABLE)
+	cp ${srcdir}/icons/scummvm_drawer.info $(AMIGAOSPATH).info
+	cp ${srcdir}/icons/scummvm.info $(AMIGAOSPATH)/$(EXECUTABLE).info
+	cp $(DIST_FILES_THEMES) $(AMIGAOSPATH)/themes/
+ifdef DIST_FILES_ENGINEDATA
+	cp $(DIST_FILES_ENGINEDATA) $(AMIGAOSPATH)/extras/
+endif
+	cp $(DIST_FILES_DOCS) $(AMIGAOSPATH)
diff --git a/backends/platform/sdl/ps3/ps3.mk b/backends/platform/sdl/ps3/ps3.mk
new file mode 100644
index 0000000000..a06409fc65
--- /dev/null
+++ b/backends/platform/sdl/ps3/ps3.mk
@@ -0,0 +1,27 @@
+ps3pkg: $(EXECUTABLE)
+	$(STRIP) $(EXECUTABLE)
+	sprxlinker $(EXECUTABLE)
+	mkdir -p ps3pkg/USRDIR/data/
+	mkdir -p ps3pkg/USRDIR/doc/
+	mkdir -p ps3pkg/USRDIR/saves/
+	make_self_npdrm "$(EXECUTABLE)" ps3pkg/USRDIR/EBOOT.BIN UP0001-SCUM12000_00-0000000000000000
+	cp $(DIST_FILES_THEMES) ps3pkg/USRDIR/data/
+ifdef DIST_FILES_ENGINEDATA
+	cp $(DIST_FILES_ENGINEDATA) ps3pkg/USRDIR/data/
+endif
+	cp $(DIST_FILES_DOCS) ps3pkg/USRDIR/doc/
+	cp $(srcdir)/dists/ps3/readme-ps3.md ps3pkg/USRDIR/doc/
+	cp $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip ps3pkg/USRDIR/data/
+	cp $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip ps3pkg/USRDIR/data/
+	cp $(srcdir)/dists/ps3/ICON0.PNG ps3pkg/
+	cp $(srcdir)/dists/ps3/PIC1.PNG ps3pkg/
+	sfo.py -f $(srcdir)/dists/ps3/sfo.xml ps3pkg/PARAM.SFO
+	pkg.py --contentid UP0001-SCUM12000_00-0000000000000000 ps3pkg/ scummvm-ps3.pkg
+
+ps3run: $(EXECUTABLE)
+	$(STRIP) $(EXECUTABLE)
+	sprxlinker $(EXECUTABLE)
+	make_self $(EXECUTABLE) $(EXECUTABLE).self
+	ps3load $(EXECUTABLE).self
+
+.PHONY: ps3pkg ps3run
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 41610dc0c7..4dc5929dab 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -390,7 +390,7 @@ Common::String OSystem_SDL::getSystemLanguage() const {
 #else // WIN32
 	// Activating current locale settings
 	const Common::String locale = setlocale(LC_ALL, "");
- 
+
 	// Restore default C locale to prevent issues with
 	// portability of sscanf(), atof(), etc.
 	// See bug #3615148
diff --git a/backends/platform/symbian/AdaptAllMMPs.pl b/backends/platform/symbian/AdaptAllMMPs.pl
index 18a464b580..6eed7f0690 100644
--- a/backends/platform/symbian/AdaptAllMMPs.pl
+++ b/backends/platform/symbian/AdaptAllMMPs.pl
@@ -16,6 +16,7 @@ chdir("../../../");
 	"mmp/scummvm_cruise.mmp",
 	"mmp/scummvm_draci.mmp",
 	"mmp/scummvm_drascula.mmp",
+	"mmp/scummvm_dreamweb.mmp",
 	"mmp/scummvm_gob.mmp",
 	"mmp/scummvm_groovie.mmp",
 	"mmp/scummvm_hopkins.mmp",
@@ -25,6 +26,7 @@ chdir("../../../");
 	"mmp/scummvm_m4.mmp",
 	"mmp/scummvm_made.mmp",
 	"mmp/scummvm_mohawk.mmp",
+	"mmp/scummvm_mortevielle.mmp",
 	"mmp/scummvm_neverhood.mmp",
 	"mmp/scummvm_parallaction.mmp",
 	"mmp/scummvm_pegasus.mmp",
@@ -43,19 +45,18 @@ chdir("../../../");
 	"mmp/scummvm_touche.mmp",
 	"mmp/scummvm_tsage.mmp",
 	"mmp/scummvm_tucker.mmp",
+	"mmp/scummvm_voyeur.mmp",
 	"mmp/scummvm_wintermute.mmp",
 	# New engines
 	"mmp/scummvm_avalanche.mmp",
 	"mmp/scummvm_bbvs.mmp",
-	"mmp/scummvm_dreamweb.mmp",
+	"mmp/scummvm_cge2.mmp",
 	"mmp/scummvm_fullpipe.mmp",
 	"mmp/scummvm_lastexpress.mmp",
 	"mmp/scummvm_mads.mmp",
-	"mmp/scummvm_mortevielle.mmp",
 	"mmp/scummvm_sword25.mmp",
 	"mmp/scummvm_testbed.mmp",
 	"mmp/scummvm_zvision.mmp",
-	"mmp/scummvm_voyeur.mmp",
 	# Target Platform Project Files
 	"S60/ScummVM_S60.mmp",
 	"S60v3/ScummVM_S60v3.mmp",
@@ -92,7 +93,6 @@ Preparing to update all the Symbian MMP project files with objects from module.m
 # some modules.mk files have #ifndef ENABLE_XXXX blocks:
 my @section_empty = (""); # section standard: no #ifdef's in module.mk files
 my @sections_agos = ("", "ENABLE_AGOS2"); # special sections for engine AGOS
-my @section_video = ("", "USE_BINK"); # special sections for engine VIDEO ###, "USE_THEORADEC"
 my @sections_groovie = ("", "ENABLE_GROOVIE2"); # special sections for engine GROOVIE
 my @sections_kyra = ("", "ENABLE_LOL","ENABLE_EOB"); # special sections for engine KYRA
 my @sections_mohawk = ("", "ENABLE_CSTIME", "ENABLE_MYST", "ENABLE_RIVEN");  # special sections for engine MOHAWK
@@ -135,7 +135,7 @@ my @excludes_gui = (
 
 # the USE_ARM_* defines not parsed correctly, exclude manually:
 my @excludes_scumm = (
-	".*ARM.*",		# the *ARM.s files are added in .mpp files based on WINS/ARM build!
+	".*ARM.*",		# the *ARM.s files are added in .mmp files based on WINS/ARM build!
 	# USE_ARM_SMUSH_ASM		codec47ARM.s
 	# USE_ARM_GFX_ASM		gfxARM.s
 	# USE_ARM_COSTUME_ASM	proc3ARM.s			compiled, linked?, but *not* used :P (portdefs.h)
@@ -149,57 +149,58 @@ ParseModule("_base",	"gui",		\@section_empty,		\@excludes_gui);
 ParseModule("_base",	"graphics",	\@section_empty,		\@excludes_graphics);
 ParseModule("_base",	"image",	\@section_empty);
 ParseModule("_base",	"audio",	\@section_empty,		\@excludes_snd);
-ParseModule("_base",	"video",	\@section_video); #
+ParseModule("_base",	"video",	\@section_empty);
 
 chdir("engines/");
 ParseModule("_scumm",	"scumm",	\@sections_scumm,		\@excludes_scumm );
-ParseModule("_queen",	"queen",	\@section_empty);
+ParseModule("_agi",		"agi",		\@section_empty);
 ParseModule("_agos",	"agos",		\@sections_agos);
-ParseModule("_sky",		"sky",		\@section_empty);
-ParseModule("_gob",		"gob",		\@section_empty);
-ParseModule("_saga",	"saga",		\@sections_saga);
-ParseModule("_kyra",	"kyra",		\@sections_kyra);
-ParseModule("_sword1",	"sword1",	\@section_empty);
-ParseModule("_sword2",	"sword2",	\@section_empty);
-ParseModule("_lure",	"lure",		\@section_empty);
 ParseModule("_cine",	"cine",		\@section_empty);
-ParseModule("_cge",	    "cge",		\@section_empty);
 ParseModule("_composer","composer",	\@section_empty);
-ParseModule("_agi",		"agi",		\@section_empty);
-ParseModule("_touche",	"touche",	\@section_empty);
-ParseModule("_parallaction","parallaction",\@section_empty);
 ParseModule("_cruise",	"cruise",	\@section_empty);
+ParseModule("_cge",	    "cge",		\@section_empty);
+ParseModule("_draci",	"draci",	\@section_empty);
 ParseModule("_drascula","drascula",	\@section_empty);
-ParseModule("_made",	"made",		\@section_empty);
-ParseModule("_m4",		"m4",		\@section_empty);
-ParseModule("_tinsel",	"tinsel",	\@section_empty);
+ParseModule("_dreamweb"     ,"dreamweb",	\@section_empty);
+ParseModule("_gob",		"gob",		\@section_empty);
 ParseModule("_groovie",	"groovie",	\@sections_groovie);
-ParseModule("_tucker",	"tucker",	\@section_empty);
+ParseModule("_hopkins","hopkins",	\@section_empty);
+ParseModule("_hugo"     ,"hugo",	\@section_empty);
+ParseModule("_kyra",	"kyra",		\@sections_kyra);
+ParseModule("_lure",	"lure",		\@section_empty);
+ParseModule("_made",	"made",		\@section_empty);
+ParseModule("_mohawk"   ,"mohawk",	\@sections_mohawk);
+ParseModule("_mortevielle"  ,"mortevielle",	\@section_empty);
+ParseModule("_neverhood"  ,"neverhood",	\@section_empty);
+ParseModule("_parallaction","parallaction",\@section_empty);
+ParseModule("_pegasus","pegasus",	\@section_empty);
+ParseModule("_queen",	"queen",	\@section_empty);
+ParseModule("_saga",	"saga",		\@sections_saga);
 ParseModule("_sci",		"sci",		\@sections_sci);
-ParseModule("_draci",	"draci",	\@section_empty);
+ParseModule("_sky",		"sky",		\@section_empty);
+ParseModule("_sword1",	"sword1",	\@section_empty);
+ParseModule("_sword2",	"sword2",	\@section_empty);
 ParseModule("_teenagent","teenagent",	\@section_empty);
-ParseModule("_mohawk"   ,"mohawk",	\@sections_mohawk);
-ParseModule("_hugo"     ,"hugo",	\@section_empty);
+ParseModule("_tinsel",	"tinsel",	\@section_empty);
+ParseModule("_toltecs","toltecs",	\@section_empty);
+ParseModule("_tony",	"tony",		\@section_empty);
 ParseModule("_toon"     ,"toon",	\@section_empty);
-ParseModule("_lastexpress","lastexpress",	\@section_empty);
+ParseModule("_touche",	"touche",	\@section_empty);
 ParseModule("_tsage",	"tsage",	\@section_empty);
-ParseModule("_tony",	"tony",		\@section_empty);
-ParseModule("_toltecs","toltecs",	\@section_empty);
-ParseModule("_hopkins","hopkins",	\@section_empty);
-ParseModule("_pegasus","pegasus",	\@section_empty);
+ParseModule("_tucker",	"tucker",	\@section_empty);
+ParseModule("_voyeur"     ,"voyeur",	\@section_empty);
 ParseModule("_wintermute","wintermute",	\@section_empty);
 ##### new engines
 ParseModule("_avalanche"     ,"avalanche",	\@section_empty);
-ParseModule("_dreamweb"     ,"dreamweb",	\@section_empty);
+ParseModule("_bbvs"     	,"bbvs",	\@section_empty);
+ParseModule("_cge2"     	,"cge2",	\@section_empty);
 ParseModule("_fullpipe"     ,"fullpipe",	\@section_empty);
+ParseModule("_lastexpress","lastexpress",	\@section_empty);
+ParseModule("_m4",		"m4",		\@section_empty);
 ParseModule("_mads"			,"mads",	\@section_empty);
-ParseModule("_mortevielle"  ,"mortevielle",	\@section_empty);
-ParseModule("_neverhood"  ,"neverhood",	\@section_empty);
 ParseModule("_sword25"     ,"sword25",	\@section_empty);
 ParseModule("_testbed"     ,"testbed",	\@section_empty);
 ParseModule("_zvision"     ,"zvision",	\@section_empty);
-ParseModule("_voyeur"     ,"voyeur",	\@section_empty);
-ParseModule("_bbvs"     	,"bbvs",	\@section_empty);
 print "
 =======================================================================================
 Done. Enjoy :P
diff --git a/backends/platform/symbian/BuildPackageUpload_AllVersions.pl b/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
index a038bd90f8..fe81ed2261 100644
--- a/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
+++ b/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
@@ -64,10 +64,8 @@ $ExtraMacros .= "MACRO		ENABLE_VKEYBD\n";
 $ExtraMacros .= "MACRO		DISABLE_FANCY_THEMES\n";
 $ExtraMacros .= "MACRO		USE_TRANSLATION\n";
 $ExtraMacros .= "MACRO		USE_BINK\n";
-#$ExtraMacros .= "MACRO		USE_THEORADEC\n";
-#$ExtraMacros .= "MACRO		USE_MPEG2\n";
 # $ExtraMacros .= "MACRO		\n";
-# candidates are : , USE_TIMIDITY,
+# candidates are : USE_TIMIDITY
 
 # prep nice list of SDKs
 #while( ($SDK, $RootDir) = each(%SDK_RootDirs) )
diff --git a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
index 12fc2668e3..f9b376d674 100644
--- a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
+++ b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
@@ -2,19 +2,19 @@
 ##################################################################################################################
 
 	@WorkingEngines = qw(
-		agos agi bbvs cine cge composer cruise draci
+		agos agi cine cge composer cruise draci dreamweb
 		drascula hugo gob groovie kyra lastexpress
 		lure made mohawk parallaction pegasus queen
 		saga sci scumm sky sword1 sword2 teenagent tinsel
 		toltecs tony toon touche tsage tucker wintermute
-		dreamweb fullpipe hopkins mortevielle mads
+		bbvs fullpipe hopkins mortevielle mads cge2
 		neverhood testbed avalanche zvision voyeur
 	);
 #### New engines
 ####		sword25
 
 	@WorkingEngines_1st = qw(
-		cine composer cruise drascula groovie
+		cge2 cine composer cruise drascula groovie
 		lastexpress made parallaction queen
 		saga scumm touche tucker wintermute
 		avalanche zvision voyeur
@@ -227,7 +227,7 @@
 		$SDK_RootDirs{'UIQ3'}= "G:\\UIQ3";
 		#$SDK_RootDirs{'S60v1'}= "D:\\S60v1";
 		#$SDK_RootDirs{'S60v2'}= "D:\\S60v2";
-		$SDK_RootDirs{'S60v3'}= "G:\\S60v3";
+		$SDK_RootDirs{'S60v3'}= "G:\\S60v5";
 		#$SDK_RootDirs{'S80'}= "D:\\S80";
 		#$SDK_RootDirs{'S90'}= "D:\\S90";
 		#$ECompXL_BinDir= "D:\\ECompXL\\";
diff --git a/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
index cbb9679340..3a08763e64 100644
--- a/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
+++ b/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
@@ -1,8 +1,9 @@
 /* ScummVM - Graphic Adventure Engine
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
- * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
+ * Copyright (C) 2003-2014 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2013-2014 Fedor Strizhniou Additional library porting, engine support, help files etc
+ * Copyright (C) 2005-2014 The ScummVM project
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
@@ -56,7 +57,7 @@ LANG                    SC
 END
 
 EPOCSTACKSIZE	80000
-EPOCHEAPSIZE	5000000 64000000
+EPOCHEAPSIZE	5000000 128000000
 
 START BITMAP    ScummVM.mbm
 TARGETPATH              \Resource\Apps
@@ -136,21 +137,21 @@ SOURCE gui\Actions.cpp
 SOURCE gui\Dialog.cpp
 
 // Common error
-source common\error.cpp
-source common\quicktime.cpp
+SOURCE common\error.cpp
+SOURCE common\quicktime.cpp
 
 // Special for graphics
-source backends\graphics\symbiansdl\symbiansdl-graphics.cpp
-source backends\graphics\surfacesdl\surfacesdl-graphics.cpp
-source engines\obsolete.cpp
+SOURCE backends\graphics\symbiansdl\symbiansdl-graphics.cpp
+SOURCE backends\graphics\surfacesdl\surfacesdl-graphics.cpp
+SOURCE engines\obsolete.cpp
 
 // *** Dynamic Libraries
-LIBRARY cone.lib  eikcore.lib
-LIBRARY euser.lib apparc.lib fbscli.lib
-LIBRARY estlib.lib apgrfx.lib
-LIBRARY gdi.lib hal.lib bitgdi.lib
-LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
-library avkon.lib bafl.lib  remconcoreapi.lib remconinterfacebase.lib
+LIBRARY cone.lib  eikcore.lib euser.lib
+LIBRARY apparc.lib fbscli.lib estlib.lib
+LIBRARY apgrfx.lib gdi.lib hal.lib bitgdi.lib
+LIBRARY esock.lib mediaclientaudiostream.lib
+LIBRARY efsrv.lib ws32.lib avkon.lib bafl.lib
+LIBRARY remconcoreapi.lib remconinterfacebase.lib
 
 CAPABILITY LocalServices ReadUserData
 MACRO SDL_BACKEND
diff --git a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
index 899d10dbe3..f65be1208e 100644
--- a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
+++ b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
@@ -1,8 +1,9 @@
 /* ScummVM - Graphic Adventure Engine
  * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
- * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
+ * Copyright (C) 2003-2014 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
  * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2013 The ScummVM project
+ * Copyright (C) 2013-2014 Fedor Strizhniou Additional library porting, engine support, help files etc
+ * Copyright (C) 2005-2014 The ScummVM project
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
@@ -57,7 +58,7 @@ LANG                    SC
 END
 
 EPOCSTACKSIZE	80000
-EPOCHEAPSIZE	5000000 64000000
+EPOCHEAPSIZE	5000000 128000000
 
 START BITMAP    ScummVM.mbm
 TARGETPATH              \Resource\Apps
@@ -137,21 +138,21 @@ SOURCE gui\Actions.cpp
 SOURCE gui\Dialog.cpp
 
 // Common error
-source common\error.cpp
-source common\quicktime.cpp
+SOURCE common\error.cpp
+SOURCE common\quicktime.cpp
 
 // Special for graphics
-source backends\graphics\symbiansdl\symbiansdl-graphics.cpp
-source backends\graphics\surfacesdl\surfacesdl-graphics.cpp
-source engines\obsolete.cpp
+SOURCE backends\graphics\symbiansdl\symbiansdl-graphics.cpp
+SOURCE backends\graphics\surfacesdl\surfacesdl-graphics.cpp
+SOURCE engines\obsolete.cpp
 
 // *** Dynamic Libraries
-LIBRARY cone.lib  eikcore.lib
-LIBRARY euser.lib apparc.lib fbscli.lib
-LIBRARY estlib.lib apgrfx.lib
-LIBRARY gdi.lib hal.lib bitgdi.lib esock.lib
-LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
-library avkon.lib bafl.lib  remconcoreapi.lib remconinterfacebase.lib
+LIBRARY cone.lib  eikcore.lib euser.lib
+LIBRARY apparc.lib fbscli.lib estlib.lib
+LIBRARY apgrfx.lib gdi.lib hal.lib bitgdi.lib
+LIBRARY esock.lib mediaclientaudiostream.lib
+LIBRARY efsrv.lib ws32.lib avkon.lib bafl.lib
+LIBRARY remconcoreapi.lib remconinterfacebase.lib
 
 CAPABILITY LocalServices ReadUserData
 MACRO SDL_BACKEND
diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
index 5f74bee1c7..4c83b32805 100644
--- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
+++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
@@ -33,7 +33,7 @@
 :"ScummVM"
 
 ; UID is the app's UID
-#{"ScummVM S60v3"},(0xA0000657),1,70,0
+#{"ScummVM S60v3"},(0xA0000657),1,80,0
 
 ;Supports Series 60 v 3.0
 [0x101F7961], 0, 0, 0, {"Series60ProductID"}
@@ -74,6 +74,7 @@
 "..\..\..\..\dists\engine-data\toon.dat"-"c:\data\scummvm\toon.dat"
 "..\..\..\..\dists\engine-data\wintermute.zip"-"c:\data\scummvm\wintermute.zip"
 "..\..\..\vkeybd\packs\vkeybd_default.zip"-"c:\data\scummvm\vkeybd_default.zip"
+"..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\data\scummvm\vkeybd_small.zip"
 "..\..\..\..\gui\themes\translations.dat"-"c:\data\scummvm\translations.dat"
 "..\..\..\..\gui\themes\scummmodern.zip"-"c:\data\scummvm\scummmodern.zip"
 
diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg
index 4ef085d600..3d55584d28 100644
--- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg
+++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg
@@ -36,7 +36,7 @@
 :"ScummVM"
 
 ; UID is the app's UID
-#{"ScummVM S60v3"},(0xA0000657),1,70,6
+#{"ScummVM S60v3"},(0xA0000657),1,80,0
 
 ;Supports Series 60 v 3.0
 [0x101F7961], 0, 0, 0, {"Series60ProductID"}
@@ -82,6 +82,7 @@
 "..\..\..\..\dists\engine-data\toon.dat"-"c:\data\scummvm\toon.dat"
 "..\..\..\..\dists\engine-data\wintermute.zip"-"c:\data\scummvm\wintermute.zip"
 "..\..\..\vkeybd\packs\vkeybd_default.zip"-"c:\data\scummvm\vkeybd_default.zip"
+"..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\data\scummvm\vkeybd_small.zip"
 "..\..\..\..\gui\themes\translations.dat"-"c:\data\scummvm\translations.dat"
 "..\..\..\..\gui\themes\scummmodern.zip"-"c:\data\scummvm\scummmodern.zip"
 
diff --git a/backends/platform/symbian/UIQ3/BLD.INF.in b/backends/platform/symbian/UIQ3/BLD.INF.in
index ff12dbdd75..4ca6be145b 100644
--- a/backends/platform/symbian/UIQ3/BLD.INF.in
+++ b/backends/platform/symbian/UIQ3/BLD.INF.in
@@ -7,5 +7,6 @@ PRJ_MMPFILES
 	// empty base file, will be updated by Perl build scripts
 
 //STOP_AUTO_PROJECTS//
+gnumakefile ..\help\build_help.mk
 .\ScummVM_A0000658_UIQ3.mmp
 .\ScummVM_UIQ3.mmp
diff --git a/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in b/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in
index 7c9e9032d4..6e84ab7b08 100644
--- a/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in
+++ b/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in
@@ -58,7 +58,7 @@ LANG                    SC
 END
 
 EPOCSTACKSIZE	80000
-EPOCHEAPSIZE	5000000 64000000
+EPOCHEAPSIZE	5000000 128000000
 
 START BITMAP    ScummVM.mbm
 TARGETPATH              \Resource\Apps
@@ -92,11 +92,17 @@ STATICLIBRARY esdl.lib
 // *** Include paths
 
 USERINCLUDE	    ..\..\..\.. ..\..\..\..\gui ..\..\..\..\engines
-USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
+USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\audio
 
+SYSTEMINCLUDE	\epoc32\include\freetype
+SYSTEMINCLUDE	\epoc32\include\mpeg2dec
+SYSTEMINCLUDE   \epoc32\include\jpeg
+SYSTEMINCLUDE   \epoc32\include\png
 SYSTEMINCLUDE	\epoc32\include\ESDL
 SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
 SYSTEMINCLUDE   \epoc32\include\libc
+SYSTEMINCLUDE 	\epoc32\include\theora
+SYSTEMINCLUDE   \epoc32\include\tremor
 SYSTEMINCLUDE   \epoc32\include
 SYSTEMINCLUDE   ..\src // for portdefs.h
 
diff --git a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
index ab2956af55..fee0c81e7a 100644
--- a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
+++ b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
@@ -58,7 +58,7 @@ LANG                    SC
 END
 
 EPOCSTACKSIZE	80000
-EPOCHEAPSIZE	5000000 64000000
+EPOCHEAPSIZE	5000000 128000000
 
 START BITMAP    ScummVM.mbm
 TARGETPATH              \Resource\Apps
@@ -92,11 +92,17 @@ STATICLIBRARY esdl.lib
 // *** Include paths
 
 USERINCLUDE	    ..\..\..\.. ..\..\..\..\gui ..\..\..\..\engines
-USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
+USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\audio
 
+SYSTEMINCLUDE	\epoc32\include\freetype
+SYSTEMINCLUDE	\epoc32\include\mpeg2dec
+SYSTEMINCLUDE   \epoc32\include\jpeg
+SYSTEMINCLUDE   \epoc32\include\png
 SYSTEMINCLUDE	\epoc32\include\ESDL
 SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
 SYSTEMINCLUDE   \epoc32\include\libc
+SYSTEMINCLUDE 	\epoc32\include\theora
+SYSTEMINCLUDE   \epoc32\include\tremor
 SYSTEMINCLUDE   \epoc32\include
 SYSTEMINCLUDE   ..\src // for portdefs.h
 
diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
index b4f1cfdd5c..8ac6f97d9f 100644
--- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
+++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
@@ -32,7 +32,7 @@
 :"ScummVM"
 
 ; UID is the app's UID
-#{"ScummVM UIQ3"},(0xA0000657),1,70,0
+#{"ScummVM UIQ3"},(0xA0000657),1,80,0
 
 ; ProductID for UIQ 3.0
 ; Product/platform version UID, Major, Minor, Build, Product ID
@@ -50,20 +50,29 @@
 ; Scummvm Documentation
 "..\..\..\..\COPYRIGHT"-"!:\resource\apps\scummvm\COPYRIGHT", FT, TC
 "..\..\..\..\COPYING"-"!:\resource\apps\scummvm\COPYING", FT, TC
-"..\README"-"!:\system\apps\scummvm\SYMBIAN_README", FT, TC
+"..\README"-"!:\resource\apps\scummvm\SYMBIAN_README", FT, TC
 "..\..\..\..\AUTHORS"-"!:\resource\apps\scummvm\AUTHORS"
 "..\..\..\..\README"-"!:\resource\apps\scummvm\README"
 "..\..\..\..\NEWS"-"!:\resource\apps\scummvm\NEWS"
 
+; Scummvm help
+"..\help\ScummVM.hlp"-"!:\resource\help\ScummVM.hlp"
+
 ; Common datafiles needed for some games
-"..\..\..\..\dists\engine-data\kyra.dat"-"c:\shared\scummvm\kyra.dat"
-"..\..\..\..\dists\engine-data\sky.cpt"-"c:\shared\scummvm\sky.cpt"
+"..\..\..\..\dists\engine-data\drascula.dat"-"c:\shared\scummvm\drascula.dat"
 "..\..\..\..\dists\engine-data\hugo.dat"-"c:\shared\scummvm\hugo.dat"
+"..\..\..\..\dists\engine-data\kyra.dat"-"c:\shared\scummvm\kyra.dat"
 "..\..\..\..\dists\engine-data\lure.dat"-"c:\shared\scummvm\lure.dat"
-"..\..\..\..\dists\engine-data\drascula.dat"-"c:\shared\scummvm\drascula.dat"
+"..\..\..\..\dists\engine-data\mort.dat"-"c:\shared\scummvm\mort.dat"
+"..\..\..\..\dists\engine-data\neverhood.dat"-"c:\shared\scummvm\neverhood.dat"
+"..\..\..\..\dists\engine-data\queen.tbl"-"c:\shared\scummvm\queen.tbl"
+"..\..\..\..\dists\engine-data\sky.cpt"-"c:\shared\scummvm\sky.cpt"
 "..\..\..\..\dists\engine-data\teenagent.dat"-"c:\shared\scummvm\teenagent.dat"
+"..\..\..\..\dists\engine-data\tony.dat"-"c:\shared\scummvm\tony.dat"
 "..\..\..\..\dists\engine-data\toon.dat"-"c:\shared\scummvm\toon.dat"
+"..\..\..\..\dists\engine-data\wintermute.zip"-"c:\shared\scummvm\wintermute.zip"
 "..\..\..\vkeybd\packs\vkeybd_default.zip"-"c:\shared\scummvm\vkeybd_default.zip"
+"..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\shared\scummvm\vkeybd_small.zip"
 "..\..\..\..\gui\themes\translations.dat"-"c:\shared\scummvm\translations.dat"
 "..\..\..\..\gui\themes\scummmodern.zip"-"c:\shared\scummvm\scummmodern.zip"
 
diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg
index 722e23a1b8..4c46be50a1 100644
--- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg
+++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg
@@ -35,7 +35,7 @@
 :"ScummVM"
 
 ; UID is the app's UID
-#{"ScummVM UIQ3"},(0xA0000657),1,70,0
+#{"ScummVM UIQ3"},(0xA0000657),1,80,0
 
 ; ProductID for UIQ 3.0
 ; Product/platform version UID, Major, Minor, Build, Product ID
@@ -58,20 +58,29 @@
 ; Scummvm Documentation
 "..\..\..\..\COPYRIGHT"-"!:\resource\apps\scummvm\COPYRIGHT", FT, TC
 "..\..\..\..\COPYING"-"!:\resource\apps\scummvm\COPYING", FT, TC
-"..\README"-"!:\system\apps\scummvm\SYMBIAN_README", FT, TC
+"..\README"-"!:\resource\apps\scummvm\SYMBIAN_README", FT, TC
 "..\..\..\..\AUTHORS"-"!:\resource\apps\scummvm\AUTHORS"
 "..\..\..\..\README"-"!:\resource\apps\scummvm\README"
 "..\..\..\..\NEWS"-"!:\resource\apps\scummvm\NEWS"
 
+; Scummvm help
+"..\help\ScummVM.hlp"-"!:\resource\help\ScummVM.hlp"
+
 ; Common datafiles needed for some games
-"..\..\..\..\dists\engine-data\kyra.dat"-"c:\shared\scummvm\kyra.dat"
-"..\..\..\..\dists\engine-data\sky.cpt"-"c:\shared\scummvm\sky.cpt"
+"..\..\..\..\dists\engine-data\drascula.dat"-"c:\shared\scummvm\drascula.dat"
 "..\..\..\..\dists\engine-data\hugo.dat"-"c:\shared\scummvm\hugo.dat"
+"..\..\..\..\dists\engine-data\kyra.dat"-"c:\shared\scummvm\kyra.dat"
 "..\..\..\..\dists\engine-data\lure.dat"-"c:\shared\scummvm\lure.dat"
-"..\..\..\..\dists\engine-data\drascula.dat"-"c:\shared\scummvm\drascula.dat"
+"..\..\..\..\dists\engine-data\mort.dat"-"c:\shared\scummvm\mort.dat"
+"..\..\..\..\dists\engine-data\neverhood.dat"-"c:\shared\scummvm\neverhood.dat"
+"..\..\..\..\dists\engine-data\queen.tbl"-"c:\shared\scummvm\queen.tbl"
+"..\..\..\..\dists\engine-data\sky.cpt"-"c:\shared\scummvm\sky.cpt"
 "..\..\..\..\dists\engine-data\teenagent.dat"-"c:\shared\scummvm\teenagent.dat"
+"..\..\..\..\dists\engine-data\tony.dat"-"c:\shared\scummvm\tony.dat"
 "..\..\..\..\dists\engine-data\toon.dat"-"c:\shared\scummvm\toon.dat"
+"..\..\..\..\dists\engine-data\wintermute.zip"-"c:\shared\scummvm\wintermute.zip"
 "..\..\..\vkeybd\packs\vkeybd_default.zip"-"c:\shared\scummvm\vkeybd_default.zip"
+"..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\shared\scummvm\vkeybd_small.zip"
 "..\..\..\..\gui\themes\translations.dat"-"c:\shared\scummvm\translations.dat"
 "..\..\..\..\gui\themes\scummmodern.zip"-"c:\shared\scummvm\scummmodern.zip"
 
diff --git a/backends/platform/symbian/help/ScummVM.rtf b/backends/platform/symbian/help/ScummVM.rtf
index 352e2e8776..8e9d37363c 100644
--- a/backends/platform/symbian/help/ScummVM.rtf
+++ b/backends/platform/symbian/help/ScummVM.rtf
@@ -49,16 +49,17 @@ Synonyms;}{\*\cs33 \additive \super \sbasedon10 endnote reference;}{\s34\ql \fi-
 {\listoverride\listid-129\listoverridecount0\ls2}{\listoverride\listid-119\listoverridecount0\ls3}{\listoverride\listid-125\listoverridecount0\ls4}{\listoverride\listid-120\listoverridecount0\ls5}{\listoverride\listid-129\listoverridecount0\ls6}
 {\listoverride\listid-119\listoverridecount0\ls7}{\listoverride\listid-125\listoverridecount0\ls8}{\listoverride\listid-120\listoverridecount0\ls9}{\listoverride\listid-129\listoverridecount0\ls10}{\listoverride\listid-119\listoverridecount0\ls11}
 {\listoverride\listid-125\listoverridecount0\ls12}{\listoverride\listid-120\listoverridecount0\ls13}{\listoverride\listid-129\listoverridecount0\ls14}{\listoverride\listid-119\listoverridecount0\ls15}{\listoverride\listid-125\listoverridecount0\ls16}
-{\listoverride\listid-120\listoverridecount0\ls17}{\listoverride\listid-129\listoverridecount0\ls18}{\listoverride\listid-119\listoverridecount0\ls19}{\listoverride\listid-125\listoverridecount0\ls20}{\listoverride\listid-2\listoverridecount1{\lfolevel
-\listoverrideformat{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelold\levelspace0\levelindent283{\leveltext\'01\u-3991 ?;}{\levelnumbers;}\f30\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-283\li283 
-}}\ls21}{\listoverride\listid-2\listoverridecount1{\lfolevel\listoverrideformat{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelold\levelspace0\levelindent283{\leveltext\'01\u-3991 ?;}{\levelnumbers;}\f30\chbrdr
-\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-283\li283 }}\ls22}}{\info{\author Fedor}{\operator Fedor}{\creatim\yr2013\mo11\dy30\hr23\min4}{\revtim\yr2014\mo5\dy28\hr12\min17}{\version97}{\edmins91}{\nofpages8}{\nofwords1514}{\nofchars8634}
-{\*\company DEV}{\nofcharsws0}{\vern8249}}\margl1701\margr850\margt1134\margb1134 \deftab708\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0
-\dgvshow3\jcompress\viewkind4\viewscale100\nolnhtadjtbl \fet0{\*\template E:\\Documents and Settings\\Administrator\\Application Data\\Microsoft\\\'d8\'e0\'e1\'eb\'ee\'ed\'fb\\cshelp2000.dot}\sectd \linex0\sectdefaultcl {\*\pnseclvl1
-\pnucrm\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang{\pntxta )}}{\*\pnseclvl5
-\pndec\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang
-{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}\pard\plain \s17\ql \li0\ri0\sa120\widctlpar\nooverflow\faroman\rin0\lin0\itap0 \i\f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {
-\lang1033\langfe1033\langnp1033 Author: Fedor Strizhniou.}{\f28 
+{\listoverride\listid-120\listoverridecount0\ls17}{\listoverride\listid-129\listoverridecount0\ls18}{\listoverride\listid-119\listoverridecount0\ls19}{\listoverride\listid-125\listoverridecount0\ls20}{\listoverride\listid-120\listoverridecount0\ls21}
+{\listoverride\listid-129\listoverridecount0\ls22}{\listoverride\listid-119\listoverridecount0\ls23}{\listoverride\listid-125\listoverridecount0\ls24}{\listoverride\listid-120\listoverridecount0\ls25}{\listoverride\listid-129\listoverridecount0\ls26}
+{\listoverride\listid-119\listoverridecount0\ls27}{\listoverride\listid-125\listoverridecount0\ls28}{\listoverride\listid-2\listoverridecount1{\lfolevel\listoverrideformat{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
+\levelold\levelspace0\levelindent283{\leveltext\'01\u-3991 ?;}{\levelnumbers;}\f30\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-283\li283 }}\ls29}{\listoverride\listid-2\listoverridecount1{\lfolevel\listoverrideformat{\listlevel
+\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelold\levelspace0\levelindent283{\leveltext\'01\u-3991 ?;}{\levelnumbers;}\f30\chbrdr\brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-283\li283 }}\ls30}}{\info{\author Fedor}
+{\operator Fedor}{\creatim\yr2013\mo11\dy30\hr23\min4}{\revtim\yr2014\mo9\dy9\hr19\min22}{\version99}{\edmins93}{\nofpages8}{\nofwords1514}{\nofchars8634}{\*\company DEV}{\nofcharsws0}{\vern8249}}\margl1701\margr850\margt1134\margb1134 
+\deftab708\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind4\viewscale100\nolnhtadjtbl \fet0{\*\template 
+E:\\Documents and Settings\\Administrator\\Application Data\\Microsoft\\\'d8\'e0\'e1\'eb\'ee\'ed\'fb\\cshelp2000.dot}\sectd \linex0\sectdefaultcl {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang
+{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang{\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang
+{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}\pard\plain 
+\s17\ql \li0\ri0\sa120\widctlpar\nooverflow\faroman\rin0\lin0\itap0 \i\f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\lang1033\langfe1033\langnp1033 Author: Fedor Strizhniou.}{\f28 
 \par }{\lang1033\langfe1033\langnp1033 Date: November 2013}{\f28 
 \par }{\lang1033\langfe1033\langnp1033 Version: 1.7.0
 \par }\pard\plain \s1\ql \li0\ri0\sb360\sa240\keepn\widctlpar\nooverflow\faroman\outlinelevel0\rin0\lin0\itap0 \b\f1\fs32\lang2057\langfe1033\kerning28\cgrid\langnp2057\langfenp1033 {ScummVM Help
@@ -66,8 +67,8 @@ Synonyms;}{\*\cs33 \additive \super \sbasedon10 endnote reference;}{\s34\ql \fi-
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 
 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\b0\f28 
 About ScummVM Help
-\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls21\pnrnot0
-\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls21\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {About ScummVM Help
+\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls29\pnrnot0
+\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls29\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {About ScummVM Help
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 
 \par }{
 This help file based on ScummVM forum thread with some elaborations(in Anotherguest section) and text correction. If you wish add some text or translate you may download and modify source document from https://sourceforge.net/projects/scummvms60git/ and t
@@ -78,8 +79,8 @@ hen send me to fedor_qd@mail.ru
 \par }{\f29 
 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 
 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\b0\f28 1st guide
-\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls21\pnrnot0
-\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls21\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, UIQ, UIQ3, S80, s80, S90, s90
+\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls29\pnrnot0
+\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls29\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, UIQ, UIQ3, S80, s80, S90, s90
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 
 \par }{UIQ3 devices: To the top right (holding the phone portrait) you four icons, from the top they are
 \par 
@@ -125,16 +126,17 @@ through directorylist (one hand use perhaps!?) or save games etc. Keyboard mode
  of events that ScummVM receives from SDL.
 \par What are these Shrinked, Zoomed and Upscaled modes anyway?
 \par 
-\par Shrink displays the game on your screen but in a shrinked way, either in Portrait or Landscape mode, so not all the pixels can be seen. Zoom mode uses the maximum resolution of your phone displaying a smaller part of the game zoomed at 1:1 pixels. For scr
-olling in S60 Zoom mode: 0+Cursor keys to scroll around, 0+Ok button to center view. Upscale tries to fill the larger screens on S80/S90 devices in a better way for low resolution games. Currently it uses a pixel interpolation upscaling routine.
+\par Shrink displays the game on your screen but in a shrinked way, either in Portrait or Landscape mode, so not all the pixels c
+an be seen. Zoom mode uses the maximum resolution of your phone displaying a smaller part of the game zoomed at 1:1 pixels. For scrolling in S60 Zoom mode: 0+Cursor keys to scroll around, 0+Ok button to center view. Upscale tries to fill the larger screen
+s on S80/S90 devices in a better way for low resolution games. Currently it uses a pixel interpolation upscaling routine.
 \par 
 \par You can also use a bluetooth mouse with S60v3 devices to control your game. You need the bluetooth hid library from Hinkka http://koti.mbnet.fi/hinkka/Download.html to get it to work properly.
 \par }{\f29 
 \par 
 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 
 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\b0\f28 2nd guide
-\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls21\pnrnot0
-\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls21\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, s60
+\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls29\pnrnot0
+\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls29\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, s60
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 
 \par 
 \par }{More user-friendly guide for Nokia phones (based on N96 but should apply to most phones)
@@ -159,8 +161,9 @@ olling in S60 Zoom mode: 0+Cursor keys to scroll around, 0+Ok button to center v
 \par }{1 - Change Input.
 \par This is the option you'll probably use the most. There are three settings; A,C and J.
 \par 
-\par A - This is the "Text Input" mode. It allows you to type directl
-y into ScummVM as if you were using a keyboard. Type the same way you would when sending a text message off of your phone. Please note that the pointer is disabled when in this mode. Don't forget to exit Configuration Mode before typing!
+\par A -
+ This is the "Text Input" mode. It allows you to type directly into ScummVM as if you were using a keyboard. Type the same way you would when sending a text message off of your phone. Please note that the pointer is disabled when in this mode. Don't forge
+t to exit Configuration Mode before typing!
 \par 
 \par C - This is the "Cursor" mode. This emulates the arrow keys of the keyboard. Some games require using this instead of the mouse (e.g. the destruction derby section towards the end of Full Throttle).
 \par 
@@ -175,8 +178,8 @@ y into ScummVM as if you were using a keyboard. Type the same way you would when
 \par Only applies to Landscape mode, simply swaps the screen output between having the phone tilted on its left side or on its right side.
 \par 
 \par 4 - Toggle Zoom On and Off
-\par Zooms in on a portion of the screen. Handy for when you are looking through a screen for items or having trouble reading subtitles. Use the navigation buttons for panning around the play area. Don't forget you'll have to exit out of Confi
-guration Mode before you can move the pointer again. Exiting Configuration Mode does not reset the zoom level. 
+\par Zooms in on a portion of the screen. Handy for when you are looking through a screen for items or having trouble reading subtitles. Use the navigation buttons for panning around
+ the play area. Don't forget you'll have to exit out of Configuration Mode before you can move the pointer again. Exiting Configuration Mode does not reset the zoom level. 
 \par }{\f29 
 \par }{5 & 6 - Unused
 \par 
@@ -197,8 +200,8 @@ guration Mode before you can move the pointer again. Exiting Configuration Mode
 \par 
 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 
 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\b0\f28 3rd guide
-\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls21\pnrnot0
-\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls21\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, s60
+\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls29\pnrnot0
+\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls29\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Controls, Virtual keyboard, Shortcuts, ScummVM, Tips, S60, s60
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\f28 
 \par 
 \par }{ScummVM keys on Nokia e71 (most likely on any other qwerty-device, too), tested on version 0.14.0svn (Feb. 18 2009
@@ -252,8 +255,9 @@ guration Mode before you can move the pointer again. Exiting Configuration Mode
 \par p -- punch (hand)
 \par 
 \par AGI games (King's Quest, Police Quest etc.):
-\par The games work beautifully on the E71, but there's some stupid bugs (in input). I recall finding some debug keys and "last sentence" / "inventory" -keys in earlier version, but I can't find them any more. Also you can't turn on sirens in Police Quest, whi
-ch kinda makes it unplayable.
+\par The
+ games work beautifully on the E71, but there's some stupid bugs (in input). I recall finding some debug keys and "last sentence" / "inventory" -keys in earlier version, but I can't find them any more. Also you can't turn on sirens in Police Quest, which 
+kinda makes it unplayable.
 \par 
 \par There's good side and bad side to each input mode:
 \par Keyboard (I use this primarily)
@@ -274,11 +278,12 @@ ch kinda makes it unplayable.
 \par }{\f28 
 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 
 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {ScummVM1 engines list
-\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls22\pnrnot0
-\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls22\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Supported engines
+\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls30\pnrnot0
+\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls30\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Supported engines
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {agi
 \par agos
 \par \tab AGOS2
+\par cge2
 \par cine
 \par composer
 \par cruise
@@ -302,12 +307,13 @@ ch kinda makes it unplayable.
 \par \tab SCUMM_7_8
 \par touche
 \par tucker
+\par voyeur
 \par wintermute
 \par 
 \par }\pard\plain \s2\ql \li0\ri0\sb120\sa120\keepn\widctlpar\brdrt\brdrs\brdrw30\brsp20 \brdrb\brdrs\brdrw30\brsp20 \tqr\tx9072{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\nooverflow\faroman\outlinelevel1\rin0\lin0\itap0 
 \b\f1\fs24\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {ScummVM2 engines list
-\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls22\pnrnot0
-\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls22\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Supported engines
+\par {\pntext\pard\plain\s26 \f30\fs20\lang2057\langfe1033\langnp2057\langfenp1033 \loch\af30\dbch\af0\hich\f30 \'69\tab}}\pard\plain \s26\ql \fi-283\li283\ri0\sa120\widctlpar\brdrb\brdrs\brdrw15\brsp20 {\*\pn \pnlvlblt\ilvl0\ls30\pnrnot0
+\pnf30\pnstart1\pnindent283\pnhang{\pntxtb i}}\nooverflow\faroman\ls30\rin0\lin283\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {Supported engines
 \par }\pard\plain \ql \li0\ri0\sa120\widctlpar\nooverflow\faroman\rin0\lin0\itap0 \f1\fs20\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {avalanche
 \par cge
 \par composer
diff --git a/backends/platform/symbian/mmp/config.mmh b/backends/platform/symbian/mmp/config.mmh
new file mode 100644
index 0000000000..075697d99a
--- /dev/null
+++ b/backends/platform/symbian/mmp/config.mmh
@@ -0,0 +1,69 @@
+/* ScummVM - Graphic Adventure Engine
+ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
+ * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
+ * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
+ * Copyright (C) 2005-2014 The ScummVM Team
+ * Copyright (C) 2014 Fedor Strizhniou
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+//
+// Common EPOC MMP makefiles option storage for ScummVM
+//
+
+/*
+ * MACRO REMOVE_UNDEFINED used for bypass this bug -
+ * http://sourceforge.net/p/scummvm/bugs/6437/
+ * Requre change in epoc32\include\libc\sys\unistd.h by
+ *
+ *  #ifndef REMOVE_UNDEFINED
+ *  #define remove(x)       unlink(x)
+ *  #define wremove(x)       wunlink(x)
+ *  #endif //REMOVE_UNDEFINED
+ *
+ * Affects Avalanche, CGE2 and Tsage
+ */
+
+// *** Definitions
+
+OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
+OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+// -Wno-psabi turn off "note: the mangling of 'va_list' has changed in GCC 4.4"
+OPTION			GCCE -pipe -Wno-multichar -Wno-reorder -Wno-unused \
+ -Wno-format -fsigned-char -Wno-psabi
+ALWAYS_BUILD_AS_ARM
+
+// *** Include paths
+
+USERINCLUDE     ..\..\..\..\engines
+USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
+
+SYSTEMINCLUDE	\epoc32\include\freetype
+SYSTEMINCLUDE	\epoc32\include\mpeg2dec
+SYSTEMINCLUDE   \epoc32\include\jpeg
+SYSTEMINCLUDE   \epoc32\include\png
+SYSTEMINCLUDE	\epoc32\include\ESDL
+SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
+SYSTEMINCLUDE   \epoc32\include\libc
+SYSTEMINCLUDE 	\epoc32\include\theora
+SYSTEMINCLUDE   \epoc32\include\tremor
+SYSTEMINCLUDE   \epoc32\include
+SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_agi.mmp.in b/backends/platform/symbian/mmp/scummvm_agi.mmp.in
index d6f9e54b7d..f24e3ef1a9 100644
--- a/backends/platform/symbian/mmp/scummvm_agi.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_agi.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_agi.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\agi
 
 //STOP_AUTO_OBJECTS_AGI_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_agos.mmp.in b/backends/platform/symbian/mmp/scummvm_agos.mmp.in
index d2b1329a24..ff15c8d5b0 100644
--- a/backends/platform/symbian/mmp/scummvm_agos.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_agos.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_agos.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -59,19 +56,3 @@ SOURCEPATH ..\..\..\..\engines\agos
 
 //STOP_AUTO_OBJECTS_AGOS_ENABLE_AGOS2//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_avalanche.mmp.in b/backends/platform/symbian/mmp/scummvm_avalanche.mmp.in
index 5260edc79d..40047bb6b7 100644
--- a/backends/platform/symbian/mmp/scummvm_avalanche.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_avalanche.mmp.in
@@ -33,10 +33,8 @@
 
 TARGET          scummvm_avalanche.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+MACRO 			REMOVE_UNDEFINED
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -54,19 +52,3 @@ SOURCEPATH ..\..\..\..\engines\avalanche
 
 //STOP_AUTO_OBJECTS_AVALANCHE_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_base.mmp.in b/backends/platform/symbian/mmp/scummvm_base.mmp.in
index 37c68bf237..88aa689f5b 100644
--- a/backends/platform/symbian/mmp/scummvm_base.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_base.mmp.in
@@ -32,12 +32,10 @@
 
 TARGET          scummvm_base.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-// using option -Wno-psabi to supress warning "note: the mangling of 'va_list' has changed in GCC 4.4"
+#include "config.mmh"
+
 // compiler must use png.h from libpng.lib instead ScummVM's
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -Wno-psabi -I'/Symbian/S60_5th_Edition_SDK_v1.0/epoc32/include/png'
-ALWAYS_BUILD_AS_ARM
+OPTION			GCCE -I'/Symbian/S60_5th_Edition_SDK_v1.0/epoc32/include/png'
 
 // Note: the LIB:*.lib statements are used by AdaptAllMMPs.pl, so don't remove them!
 //START_AUTO_MACROS_MASTER//
@@ -50,21 +48,9 @@ ALWAYS_BUILD_AS_ARM
 
 // *** Include paths
 
-USERINCLUDE	    ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio
-USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl
-USERINCLUDE		\epoc32\include\mpeg2dec //\epoc32\include\theora
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
+USERINCLUDE		..\..\..\..\backends\fs ..\..\..\..\backends\platform\sdl
+USERINCLUDE		\epoc32\include\mpeg2dec
+
 
 // *** SOURCE files
 
@@ -91,7 +77,8 @@ SOURCEPATH ..\..\..\..\image
 	// empty base file, will be updated by Perl build scripts
 
 //STOP_AUTO_OBJECTS_IMAGE_//
-
+// add a few files manually, since they are not parsed from modules.mk files
+SOURCE	   codecs\mpeg.cpp
 
 SOURCEPATH ..\..\..\..\gui
 //START_AUTO_OBJECTS_GUI_//
@@ -130,8 +117,6 @@ SOURCEPATH ..\..\..\..\video
 // add a few files manually, since they are not parsed from modules.mk files
 SOURCE	   theora_decoder.cpp
 SOURCE	   bink_decoder.cpp
-// add a few files manually, since they are not parsed from modules.mk files
-SOURCE	   codecs\mpeg.cpp
 
 SOURCEPATH ..\..\..\..
 SOURCE	   backends\events\default\default-events.cpp
diff --git a/backends/platform/symbian/mmp/scummvm_bbvs.mmp.in b/backends/platform/symbian/mmp/scummvm_bbvs.mmp.in
index b4981e6eec..20d91a910d 100644
--- a/backends/platform/symbian/mmp/scummvm_bbvs.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_bbvs.mmp.in
@@ -33,10 +33,7 @@
 
 TARGET          scummvm_bbvs.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -54,19 +51,3 @@ SOURCEPATH ..\..\..\..\engines\bbvs
 
 //STOP_AUTO_OBJECTS_BBVS_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_cge.mmp.in b/backends/platform/symbian/mmp/scummvm_cge.mmp.in
index 35cb0f2f98..29bdad0600 100644
--- a/backends/platform/symbian/mmp/scummvm_cge.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_cge.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_cge.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\cge
 
 //STOP_AUTO_OBJECTS_CGE_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_cge2.mmp.in b/backends/platform/symbian/mmp/scummvm_cge2.mmp.in
new file mode 100644
index 0000000000..f9c97e1d83
--- /dev/null
+++ b/backends/platform/symbian/mmp/scummvm_cge2.mmp.in
@@ -0,0 +1,53 @@
+/* ScummVM - Graphic Adventure Engine
+ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
+ * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
+ * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
+ * Copyright (C) 2005-2013 The ScummVM project
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+//
+// EPOC MMP makefile project for ScummVM
+//
+
+// *** Definitions
+
+TARGET          scummvm_cge2.lib
+TARGETTYPE      lib
+MACRO 			REMOVE_UNDEFINED
+#include "config.mmh"
+
+//START_AUTO_MACROS_SLAVE//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_MACROS_SLAVE//
+
+// *** SOURCE files
+
+SOURCEPATH ..\..\..\..\engines\cge2
+
+//START_AUTO_OBJECTS_CGE2_//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_OBJECTS_CGE2_//
+
diff --git a/backends/platform/symbian/mmp/scummvm_cine.mmp.in b/backends/platform/symbian/mmp/scummvm_cine.mmp.in
index 99b45cddb8..f93cd30c9f 100644
--- a/backends/platform/symbian/mmp/scummvm_cine.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_cine.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_CINE.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -55,17 +52,3 @@ SOURCEPATH ..\..\..\..\engines\cine
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_composer.mmp.in b/backends/platform/symbian/mmp/scummvm_composer.mmp.in
index 5a215f2d8d..72117fbc19 100644
--- a/backends/platform/symbian/mmp/scummvm_composer.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_composer.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_COMPOSER.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\COMPOSER
 
 //STOP_AUTO_OBJECTS_COMPOSER_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_cruise.mmp.in b/backends/platform/symbian/mmp/scummvm_cruise.mmp.in
index 21a674dc1f..ceb5a2124f 100644
--- a/backends/platform/symbian/mmp/scummvm_cruise.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_cruise.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_cruise.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\cruise
 
 //STOP_AUTO_OBJECTS_CRUISE_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_draci.mmp.in b/backends/platform/symbian/mmp/scummvm_draci.mmp.in
index fe899a91ff..77750ff696 100644
--- a/backends/platform/symbian/mmp/scummvm_draci.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_draci.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_draci.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -55,17 +52,3 @@ SOURCEPATH ..\..\..\..\engines\draci
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_drascula.mmp.in b/backends/platform/symbian/mmp/scummvm_drascula.mmp.in
index 8f532d4498..7f39126e68 100644
--- a/backends/platform/symbian/mmp/scummvm_drascula.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_drascula.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_drascula.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -55,17 +52,3 @@ SOURCEPATH ..\..\..\..\engines\drascula
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_dreamweb.mmp.in b/backends/platform/symbian/mmp/scummvm_dreamweb.mmp.in
index 89ffd23ebd..22d5050597 100644
--- a/backends/platform/symbian/mmp/scummvm_dreamweb.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_dreamweb.mmp.in
@@ -33,10 +33,7 @@
 
 TARGET          scummvm_dreamweb.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -56,17 +53,3 @@ SOURCEPATH ..\..\..\..\engines\dreamweb
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_fullpipe.mmp.in b/backends/platform/symbian/mmp/scummvm_fullpipe.mmp.in
index 7612ad2bae..dc5d4da6b7 100644
--- a/backends/platform/symbian/mmp/scummvm_fullpipe.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_fullpipe.mmp.in
@@ -33,10 +33,7 @@
 
 TARGET          scummvm_fullpipe.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -54,19 +51,3 @@ SOURCEPATH ..\..\..\..\engines\fullpipe
 
 //STOP_AUTO_OBJECTS_FULLPIPE_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_gob.mmp.in b/backends/platform/symbian/mmp/scummvm_gob.mmp.in
index 884b06c61a..a46ee9c403 100644
--- a/backends/platform/symbian/mmp/scummvm_gob.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_gob.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_gob.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\gob
 
 //STOP_AUTO_OBJECTS_GOB_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_groovie.mmp.in b/backends/platform/symbian/mmp/scummvm_groovie.mmp.in
index 53fb33fef0..a2a3d5c47d 100644
--- a/backends/platform/symbian/mmp/scummvm_groovie.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_groovie.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_groovie.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -54,19 +51,3 @@ SOURCEPATH ..\..\..\..\engines\groovie
 //STOP_AUTO_OBJECTS_GROOVIE_//
 SOURCE roq.cpp
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_hopkins.mmp.in b/backends/platform/symbian/mmp/scummvm_hopkins.mmp.in
index bafc11e65f..82728942a7 100644
--- a/backends/platform/symbian/mmp/scummvm_hopkins.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_hopkins.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_HOPKINS.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\HOPKINS
 
 //STOP_AUTO_OBJECTS_HOPKINS_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
-\ No newline at end of file
diff --git a/backends/platform/symbian/mmp/scummvm_hugo.mmp.in b/backends/platform/symbian/mmp/scummvm_hugo.mmp.in
index 58622a83fd..1f250bda3f 100644
--- a/backends/platform/symbian/mmp/scummvm_hugo.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_hugo.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_hugo.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\hugo
 
 //STOP_AUTO_OBJECTS_HUGO_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
-\ No newline at end of file
diff --git a/backends/platform/symbian/mmp/scummvm_kyra.mmp.in b/backends/platform/symbian/mmp/scummvm_kyra.mmp.in
index 3fa05e856d..f3b30b1318 100644
--- a/backends/platform/symbian/mmp/scummvm_kyra.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_kyra.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_kyra.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -66,19 +63,3 @@ SOURCEPATH ..\..\..\..\engines\kyra
 
 //STOP_AUTO_OBJECTS_KYRA_ENABLE_EOB//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_lastexpress.mmp.in b/backends/platform/symbian/mmp/scummvm_lastexpress.mmp.in
index 8e0b3026c7..38d63b4648 100644
--- a/backends/platform/symbian/mmp/scummvm_lastexpress.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_lastexpress.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_lastexpress.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\lastexpress
 
 //STOP_AUTO_OBJECTS_LASTEXPRESS_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_lure.mmp.in b/backends/platform/symbian/mmp/scummvm_lure.mmp.in
index 89c93d058d..2922c9df49 100644
--- a/backends/platform/symbian/mmp/scummvm_lure.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_lure.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_lure.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\lure
 
 //STOP_AUTO_OBJECTS_LURE_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_m4.mmp.in b/backends/platform/symbian/mmp/scummvm_m4.mmp.in
index b3024c93c3..0b3a0b60e4 100644
--- a/backends/platform/symbian/mmp/scummvm_m4.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_m4.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_m4.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\m4
 
 //STOP_AUTO_OBJECTS_M4_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_made.mmp.in b/backends/platform/symbian/mmp/scummvm_made.mmp.in
index d4a63f8d87..e240685753 100644
--- a/backends/platform/symbian/mmp/scummvm_made.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_made.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_made.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,20 +50,3 @@ SOURCEPATH ..\..\..\..\engines\made
 
 //STOP_AUTO_OBJECTS_MADE_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
-
diff --git a/backends/platform/symbian/mmp/scummvm_mads.mmp.in b/backends/platform/symbian/mmp/scummvm_mads.mmp.in
index d0d6091f83..e5e990dd2d 100644
--- a/backends/platform/symbian/mmp/scummvm_mads.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_mads.mmp.in
@@ -33,10 +33,7 @@
 
 TARGET          scummvm_mads.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -54,19 +51,3 @@ SOURCEPATH ..\..\..\..\engines\mads
 
 //STOP_AUTO_OBJECTS_MADS_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_mohawk.mmp.in b/backends/platform/symbian/mmp/scummvm_mohawk.mmp.in
index e9175593ec..19bed823d5 100644
--- a/backends/platform/symbian/mmp/scummvm_mohawk.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_mohawk.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_mohawk.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -72,19 +69,3 @@ SOURCEPATH ..\..\..\..\engines\mohawk
 
 //STOP_AUTO_OBJECTS_MOHAWK_ENABLE_CSTIME//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_mortevielle.mmp.in b/backends/platform/symbian/mmp/scummvm_mortevielle.mmp.in
index f118ddbef0..06f9333c37 100644
--- a/backends/platform/symbian/mmp/scummvm_mortevielle.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_mortevielle.mmp.in
@@ -33,10 +33,7 @@
 
 TARGET          scummvm_mortevielle.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -54,19 +51,3 @@ SOURCEPATH ..\..\..\..\engines\mortevielle
 
 //STOP_AUTO_OBJECTS_MORTEVIELLE_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_neverhood.mmp.in b/backends/platform/symbian/mmp/scummvm_neverhood.mmp.in
index a57161577f..b6deeb2d73 100644
--- a/backends/platform/symbian/mmp/scummvm_neverhood.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_neverhood.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_neverhood.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -55,17 +52,3 @@ SOURCEPATH ..\..\..\..\engines\neverhood
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in b/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in
index cefdd1b282..c61e40626c 100644
--- a/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_parallaction.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\parallaction
 
 //STOP_AUTO_OBJECTS_PARALLACTION_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_pegasus.mmp.in b/backends/platform/symbian/mmp/scummvm_pegasus.mmp.in
index 68b2c12774..3ef85bf29d 100644
--- a/backends/platform/symbian/mmp/scummvm_pegasus.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_pegasus.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_PEGASUS.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\PEGASUS
 
 //STOP_AUTO_OBJECTS_PEGASUS_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
-\ No newline at end of file
diff --git a/backends/platform/symbian/mmp/scummvm_queen.mmp.in b/backends/platform/symbian/mmp/scummvm_queen.mmp.in
index 94835aae90..3a15fdd0a2 100644
--- a/backends/platform/symbian/mmp/scummvm_queen.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_queen.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_queen.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\queen
 
 //STOP_AUTO_OBJECTS_QUEEN_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_saga.mmp.in b/backends/platform/symbian/mmp/scummvm_saga.mmp.in
index 77bf839efe..ce5de459b2 100644
--- a/backends/platform/symbian/mmp/scummvm_saga.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_saga.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_saga.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -65,19 +62,3 @@ SOURCEPATH ..\..\..\..\engines\saga
 
 //STOP_AUTO_OBJECTS_SAGA_ENABLE_SAGA2//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_sci.mmp.in b/backends/platform/symbian/mmp/scummvm_sci.mmp.in
index d08501e471..49484b8c7c 100644
--- a/backends/platform/symbian/mmp/scummvm_sci.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_sci.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_sci.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -60,20 +57,3 @@ SOURCEPATH ..\..\..\..\engines\sci
 
 //STOP_AUTO_OBJECTS_SCI_ENABLE_SCI32//
 
-
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_scumm.mmp.in b/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
index a11dd071d3..60c54697d0 100644
--- a/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_scumm.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -78,17 +75,5 @@ SOURCE smush/codec47ARM.s		// ARM version: add ASM routines
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\..\engines ..\..\..\..\engines\scumm\smush ..\..\..\..\engines\scumm\insane
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
+USERINCLUDE     ..\..\..\..\engines\scumm\smush ..\..\..\..\engines\scumm\insane
+
diff --git a/backends/platform/symbian/mmp/scummvm_sky.mmp.in b/backends/platform/symbian/mmp/scummvm_sky.mmp.in
index 37fdc89f99..5363bb32ef 100644
--- a/backends/platform/symbian/mmp/scummvm_sky.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_sky.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_sky.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -55,17 +52,5 @@ SOURCEPATH ..\..\..\..\engines\sky
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\..\engines ..\..\..\..\engines\sky\music
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
+USERINCLUDE     ..\..\..\..\engines\sky\music
 
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_sword1.mmp.in b/backends/platform/symbian/mmp/scummvm_sword1.mmp.in
index 352cbe59f0..b4b2b91dae 100644
--- a/backends/platform/symbian/mmp/scummvm_sword1.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_sword1.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_sword1.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\sword1
 
 //STOP_AUTO_OBJECTS_SWORD1_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_sword2.mmp.in b/backends/platform/symbian/mmp/scummvm_sword2.mmp.in
index 7b79bf7f5c..a8c963a618 100644
--- a/backends/platform/symbian/mmp/scummvm_sword2.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_sword2.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_sword2.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\sword2
 
 //STOP_AUTO_OBJECTS_SWORD2_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_sword25.mmp.in b/backends/platform/symbian/mmp/scummvm_sword25.mmp.in
index 4159350bce..67efc10c45 100644
--- a/backends/platform/symbian/mmp/scummvm_sword25.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_sword25.mmp.in
@@ -33,10 +33,7 @@
 
 TARGET          scummvm_sword25.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -56,18 +53,6 @@ SOURCEPATH ..\..\..\..\engines\sword25
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-USERINCLUDE     ..\..\..\..\engines\sword25\util\lua ..\..\..\..\engines\sword25\util\pluto
+USERINCLUDE     ..\..\..\..\engines\sword25\util\lua 
+USERINCLUDE     ..\..\..\..\engines\sword25\util\pluto
 
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_teenagent.mmp.in b/backends/platform/symbian/mmp/scummvm_teenagent.mmp.in
index 332b9f20ac..9551eda7b6 100644
--- a/backends/platform/symbian/mmp/scummvm_teenagent.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_teenagent.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_teenagent.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\teenagent
 
 //STOP_AUTO_OBJECTS_TEENAGENT_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_testbed.mmp.in b/backends/platform/symbian/mmp/scummvm_testbed.mmp.in
index 20d3789a31..24b87d154c 100644
--- a/backends/platform/symbian/mmp/scummvm_testbed.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_testbed.mmp.in
@@ -33,10 +33,7 @@
 
 TARGET          scummvm_testbed.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -54,19 +51,3 @@ SOURCEPATH ..\..\..\..\engines\testbed
 
 //STOP_AUTO_OBJECTS_TESTBED_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_tinsel.mmp.in b/backends/platform/symbian/mmp/scummvm_tinsel.mmp.in
index 15c5850cee..a5a62ffc15 100644
--- a/backends/platform/symbian/mmp/scummvm_tinsel.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_tinsel.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_tinsel.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\tinsel
 
 //STOP_AUTO_OBJECTS_TINSEL_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
-\ No newline at end of file
diff --git a/backends/platform/symbian/mmp/scummvm_toltecs.mmp.in b/backends/platform/symbian/mmp/scummvm_toltecs.mmp.in
index df75290d81..1512dfed06 100644
--- a/backends/platform/symbian/mmp/scummvm_toltecs.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_toltecs.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_TOLTECS.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -45,7 +42,7 @@ ALWAYS_BUILD_AS_ARM
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\..\engines\TOLTECS
+SOURCEPATH ..\..\..\..\engines\toltecs
 
 //START_AUTO_OBJECTS_TOLTECS_//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\TOLTECS
 
 //STOP_AUTO_OBJECTS_TOLTECS_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_tony.mmp.in b/backends/platform/symbian/mmp/scummvm_tony.mmp.in
index bcdbc1c979..18c4f6d3cb 100644
--- a/backends/platform/symbian/mmp/scummvm_tony.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_tony.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_TONY.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -45,7 +42,7 @@ ALWAYS_BUILD_AS_ARM
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\..\engines\TONY
+SOURCEPATH ..\..\..\..\engines\tony
 
 //START_AUTO_OBJECTS_TONY_//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\TONY
 
 //STOP_AUTO_OBJECTS_TONY_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_toon.mmp.in b/backends/platform/symbian/mmp/scummvm_toon.mmp.in
index 7bfec38dc5..9c7568cc8b 100644
--- a/backends/platform/symbian/mmp/scummvm_toon.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_toon.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_toon.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\toon
 
 //STOP_AUTO_OBJECTS_TOON_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_touche.mmp.in b/backends/platform/symbian/mmp/scummvm_touche.mmp.in
index 407e275ae3..73e14ee691 100644
--- a/backends/platform/symbian/mmp/scummvm_touche.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_touche.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_touche.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\touche
 
 //STOP_AUTO_OBJECTS_TOUCHE_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_tsage.mmp.in b/backends/platform/symbian/mmp/scummvm_tsage.mmp.in
index c0705d7aad..e18db61683 100644
--- a/backends/platform/symbian/mmp/scummvm_tsage.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_tsage.mmp.in
@@ -32,11 +32,8 @@
 
 TARGET          scummvm_tsage.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-// -Wno-psabi turn off "note: the mangling of 'va_list' has changed in GCC 4.4"
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -Wno-psabi
-ALWAYS_BUILD_AS_ARM
+MACRO 			REMOVE_UNDEFINED
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -54,19 +51,3 @@ SOURCEPATH ..\..\..\..\engines\tsage
 
 //STOP_AUTO_OBJECTS_TSAGE_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_tucker.mmp.in b/backends/platform/symbian/mmp/scummvm_tucker.mmp.in
index c457dd4083..aef8841cf2 100644
--- a/backends/platform/symbian/mmp/scummvm_tucker.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_tucker.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_tucker.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\tucker
 
 //STOP_AUTO_OBJECTS_TUCKER_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_wintermute.mmp.in b/backends/platform/symbian/mmp/scummvm_wintermute.mmp.in
index 63dd7d39d8..716484755f 100644
--- a/backends/platform/symbian/mmp/scummvm_wintermute.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_wintermute.mmp.in
@@ -32,11 +32,7 @@
 
 TARGET          scummvm_wintermute.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-// -Wno-psabi turn off "note: the mangling of 'va_list' has changed in GCC 4.4"
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -Wno-psabi
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -54,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\wintermute
 
 //STOP_AUTO_OBJECTS_WINTERMUTE_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_zvision.mmp.in b/backends/platform/symbian/mmp/scummvm_zvision.mmp.in
index 642f659551..e647275dbc 100644
--- a/backends/platform/symbian/mmp/scummvm_zvision.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_zvision.mmp.in
@@ -33,10 +33,7 @@
 
 TARGET          scummvm_zvision.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -54,18 +51,3 @@ SOURCEPATH ..\..\..\..\engines\zvision
 
 //STOP_AUTO_OBJECTS_ZVISION_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/tizen/form.cpp b/backends/platform/tizen/form.cpp
index 3f7b918102..568829dc96 100644
--- a/backends/platform/tizen/form.cpp
+++ b/backends/platform/tizen/form.cpp
@@ -338,7 +338,14 @@ void TizenAppForm::showKeypad() {
 	// display the soft keyboard
 	if (_state == kActiveState) {
 		_buttonState = kLeftButton;
-		pushKey(Common::KEYCODE_F7);
+		
+		Common::Event e;
+		e.type = Common::EVENT_VIRTUAL_KEYBOARD;
+		if (_eventQueueLock) {
+			_eventQueueLock->Acquire();
+			_eventQueue.push(e);
+			_eventQueueLock->Release();
+		}
 	}
 }
 
diff --git a/backends/platform/wii/osystem_events.cpp b/backends/platform/wii/osystem_events.cpp
index 2da1d80917..13f5d1fbe0 100644
--- a/backends/platform/wii/osystem_events.cpp
+++ b/backends/platform/wii/osystem_events.cpp
@@ -70,73 +70,73 @@
 #endif
 
 #ifdef USE_WII_KBD
-static int keymap[][2] = {
-	{ KS_Return, Common::KEYCODE_RETURN },
-	{ KS_Up, Common::KEYCODE_UP },
-	{ KS_Down, Common::KEYCODE_DOWN },
-	{ KS_Left, Common::KEYCODE_LEFT },
-	{ KS_Right, Common::KEYCODE_RIGHT },
-	{ KS_Shift_L, Common::KEYCODE_LSHIFT },
-	{ KS_Shift_R, Common::KEYCODE_RSHIFT },
-	{ KS_Control_L, Common::KEYCODE_LCTRL },
-	{ KS_Control_R, Common::KEYCODE_RCTRL },
-	{ KS_Alt_L, Common::KEYCODE_LALT },
-	{ KS_Alt_R, Common::KEYCODE_RALT },
-	{ KS_Meta_L, Common::KEYCODE_LMETA },
-	{ KS_Meta_R, Common::KEYCODE_RMETA },
-	{ KS_KP_0, Common::KEYCODE_KP0 },
-	{ KS_KP_1, Common::KEYCODE_KP1 },
-	{ KS_KP_2, Common::KEYCODE_KP2 },
-	{ KS_KP_3, Common::KEYCODE_KP3 },
-	{ KS_KP_4, Common::KEYCODE_KP4 },
-	{ KS_KP_5, Common::KEYCODE_KP5 },
-	{ KS_KP_6, Common::KEYCODE_KP6 },
-	{ KS_KP_7, Common::KEYCODE_KP7 },
-	{ KS_KP_8, Common::KEYCODE_KP8 },
-	{ KS_KP_9, Common::KEYCODE_KP9 },
-	{ KS_Home, Common::KEYCODE_HOME },
-	{ KS_Insert, Common::KEYCODE_INSERT },
-	{ KS_End, Common::KEYCODE_END },
-	{ KS_Prior, Common::KEYCODE_PAGEUP },
-	{ KS_Next, Common::KEYCODE_PAGEDOWN },
-	{ KS_f1, Common::KEYCODE_F1 },
-	{ KS_f2, Common::KEYCODE_F2 },
-	{ KS_f3, Common::KEYCODE_F3 },
-	{ KS_f4, Common::KEYCODE_F4 },
-	{ KS_f5, Common::KEYCODE_F5 },
-	{ KS_f6, Common::KEYCODE_F6 },
-	{ KS_f7, Common::KEYCODE_F7 },
-	{ KS_f8, Common::KEYCODE_F8 },
-	{ KS_f9, Common::KEYCODE_F9 },
-	{ KS_f10, Common::KEYCODE_F10 },
-	{ KS_f11, Common::KEYCODE_F11 },
-	{ KS_f12, Common::KEYCODE_F12 },
-	{ KS_f13, Common::KEYCODE_F13 },
-	{ KS_f14, Common::KEYCODE_F14 },
-	{ KS_f15, Common::KEYCODE_F15 },
-	{ KS_F1, Common::KEYCODE_F1 },
-	{ KS_F2, Common::KEYCODE_F2 },
-	{ KS_F3, Common::KEYCODE_F3 },
-	{ KS_F4, Common::KEYCODE_F4 },
-	{ KS_F5, Common::KEYCODE_F5 },
-	{ KS_F6, Common::KEYCODE_F6 },
-	{ KS_F7, Common::KEYCODE_F7 },
-	{ KS_F8, Common::KEYCODE_F8 },
-	{ KS_F9, Common::KEYCODE_F9 },
-	{ KS_F10, Common::KEYCODE_F10 },
-	{ KS_F11, Common::KEYCODE_F11 },
-	{ KS_F12, Common::KEYCODE_F12 },
-	{ KS_F13, Common::KEYCODE_F13 },
-	{ KS_F14, Common::KEYCODE_F14 },
-	{ KS_F15, Common::KEYCODE_F15 },
-	{ KS_KP_Separator, Common::KEYCODE_KP_PERIOD },
-	{ KS_KP_Subtract, Common::KEYCODE_KP_DIVIDE },
-	{ KS_KP_Multiply, Common::KEYCODE_KP_MULTIPLY },
-	{ KS_KP_Add, Common::KEYCODE_KP_PLUS },
-	{ KS_KP_Subtract, Common::KEYCODE_KP_MINUS },
-	{ KS_KP_Equal, Common::KEYCODE_KP_EQUALS },
-	{ KS_KP_Enter, Common::KEYCODE_KP_ENTER },
-	{ 0, 0 }
+static int keymap[][3] = {
+	{ KS_Return, Common::KEYCODE_RETURN, Common::ASCII_RETURN },
+	{ KS_Up, Common::KEYCODE_UP, 0 },
+	{ KS_Down, Common::KEYCODE_DOWN, 0 },
+	{ KS_Left, Common::KEYCODE_LEFT, 0 },
+	{ KS_Right, Common::KEYCODE_RIGHT, 0 },
+	{ KS_Shift_L, Common::KEYCODE_LSHIFT, 0 },
+	{ KS_Shift_R, Common::KEYCODE_RSHIFT, 0 },
+	{ KS_Control_L, Common::KEYCODE_LCTRL, 0 },
+	{ KS_Control_R, Common::KEYCODE_RCTRL, 0 },
+	{ KS_Alt_L, Common::KEYCODE_LALT, 0 },
+	{ KS_Alt_R, Common::KEYCODE_RALT, 0 },
+	{ KS_Meta_L, Common::KEYCODE_LMETA, 0 },
+	{ KS_Meta_R, Common::KEYCODE_RMETA, 0 },
+	{ KS_KP_0, Common::KEYCODE_KP0, '0' },
+	{ KS_KP_1, Common::KEYCODE_KP1, '1' },
+	{ KS_KP_2, Common::KEYCODE_KP2, '2' },
+	{ KS_KP_3, Common::KEYCODE_KP3, '3' },
+	{ KS_KP_4, Common::KEYCODE_KP4, '4' },
+	{ KS_KP_5, Common::KEYCODE_KP5, '5' },
+	{ KS_KP_6, Common::KEYCODE_KP6, '6' },
+	{ KS_KP_7, Common::KEYCODE_KP7, '7' },
+	{ KS_KP_8, Common::KEYCODE_KP8, '8' },
+	{ KS_KP_9, Common::KEYCODE_KP9, '9' },
+	{ KS_Home, Common::KEYCODE_HOME, 0 },
+	{ KS_Insert, Common::KEYCODE_INSERT, 0 },
+	{ KS_End, Common::KEYCODE_END, 0 },
+	{ KS_Prior, Common::KEYCODE_PAGEUP, 0 },
+	{ KS_Next, Common::KEYCODE_PAGEDOWN, 0 },
+	{ KS_f1, Common::KEYCODE_F1, Common::ASCII_F1 },
+	{ KS_f2, Common::KEYCODE_F2, Common::ASCII_F2 },
+	{ KS_f3, Common::KEYCODE_F3, Common::ASCII_F3 },
+	{ KS_f4, Common::KEYCODE_F4, Common::ASCII_F4 },
+	{ KS_f5, Common::KEYCODE_F5, Common::ASCII_F5 },
+	{ KS_f6, Common::KEYCODE_F6, Common::ASCII_F6 },
+	{ KS_f7, Common::KEYCODE_F7, Common::ASCII_F7 },
+	{ KS_f8, Common::KEYCODE_F8, Common::ASCII_F8 },
+	{ KS_f9, Common::KEYCODE_F9, Common::ASCII_F9 },
+	{ KS_f10, Common::KEYCODE_F10, Common::ASCII_F10 },
+	{ KS_f11, Common::KEYCODE_F11, Common::ASCII_F11 },
+	{ KS_f12, Common::KEYCODE_F12, Common::ASCII_F12 },
+	{ KS_f13, Common::KEYCODE_F13, 0 },
+	{ KS_f14, Common::KEYCODE_F14, 0 },
+	{ KS_f15, Common::KEYCODE_F15, 0 },
+	{ KS_F1, Common::KEYCODE_F1, Common::ASCII_F1 },
+	{ KS_F2, Common::KEYCODE_F2, Common::ASCII_F2 },
+	{ KS_F3, Common::KEYCODE_F3, Common::ASCII_F3 },
+	{ KS_F4, Common::KEYCODE_F4, Common::ASCII_F4 },
+	{ KS_F5, Common::KEYCODE_F5, Common::ASCII_F5 },
+	{ KS_F6, Common::KEYCODE_F6, Common::ASCII_F6 },
+	{ KS_F7, Common::KEYCODE_F7, Common::ASCII_F7 },
+	{ KS_F8, Common::KEYCODE_F8, Common::ASCII_F8 },
+	{ KS_F9, Common::KEYCODE_F9, Common::ASCII_F9 },
+	{ KS_F10, Common::KEYCODE_F10, Common::ASCII_F10 },
+	{ KS_F11, Common::KEYCODE_F11, Common::ASCII_F11 },
+	{ KS_F12, Common::KEYCODE_F12, Common::ASCII_F12 },
+	{ KS_F13, Common::KEYCODE_F13, 0 },
+	{ KS_F14, Common::KEYCODE_F14, 0 },
+	{ KS_F15, Common::KEYCODE_F15, 0 },
+	{ KS_KP_Separator, Common::KEYCODE_KP_PERIOD, '.' },
+	{ KS_KP_Divide, Common::KEYCODE_KP_DIVIDE, '/' },
+	{ KS_KP_Multiply, Common::KEYCODE_KP_MULTIPLY, '*' },
+	{ KS_KP_Add, Common::KEYCODE_KP_PLUS, '+' },
+	{ KS_KP_Subtract, Common::KEYCODE_KP_MINUS, '-' },
+	{ KS_KP_Equal, Common::KEYCODE_KP_EQUALS, '=' },
+	{ KS_KP_Enter, Common::KEYCODE_KP_ENTER, Common::ASCII_RETURN },
+	{ 0, 0, 0 }
 };
 #endif
 
@@ -262,7 +262,7 @@ bool OSystem_Wii::pollKeyboard(Common::Event &event) {
 	while (keymap[i][0] != 0) {
 		if (keymap[i][0] == kbdEvent.symbol) {
 			event.kbd.keycode = static_cast<Common::KeyCode>(keymap[i][1]);
-			event.kbd.ascii = 0;
+			event.kbd.ascii = keymap[i][2];
 			return true;
 		}
 
@@ -357,8 +357,8 @@ bool OSystem_Wii::pollEvent(Common::Event &event) {
 		PAD_EVENT(PADS_Y, Common::KEYCODE_PERIOD, '.', flags);
 		PAD_EVENT(PADS_START, Common::KEYCODE_F5, Common::ASCII_F5, flags);
 		PAD_EVENT(PADS_UP, Common::KEYCODE_LSHIFT, 0, flags);
-		PAD_EVENT(PADS_DOWN, Common::KEYCODE_F7, Common::ASCII_F7, flags);
-		//PAD_EVENT(PADS_LEFT, Common::KEYCODE_F8, Common::ASCII_F8, 0);
+		PAD_EVENT(PADS_DOWN, Common::KEYCODE_F7, Common::ASCII_F7, Common::KBD_CTRL);
+		//PAD_EVENT(PADS_LEFT, Common::KEYCODE_F8, Common::ASCII_F8, Common::KBD_CTRL);
 
 		if ((bd | bu) & (PADS_A | PADS_B)) {
 			if (bd & PADS_A)
diff --git a/backends/platform/wii/wii.mk b/backends/platform/wii/wii.mk
index 99ef46338c..62a8900d9a 100644
--- a/backends/platform/wii/wii.mk
+++ b/backends/platform/wii/wii.mk
@@ -43,6 +43,7 @@ ifneq ($(DIST_FILES_ENGINEDATA),)
 	$(CP) $(DIST_FILES_ENGINEDATA) wiidist/scummvm/
 endif
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip wiidist/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip wiidist/scummvm/
 
 wiiloaddist: wiidist
 	cd wiidist && zip -9r scummvm.zip scummvm/
diff --git a/backends/taskbar/unity/unity-taskbar.cpp b/backends/taskbar/unity/unity-taskbar.cpp
index 1b82e58c8a..532d9656c3 100644
--- a/backends/taskbar/unity/unity-taskbar.cpp
+++ b/backends/taskbar/unity/unity-taskbar.cpp
@@ -26,6 +26,8 @@
 
 #if defined(POSIX) && defined(USE_TASKBAR) && defined(USE_UNITY)
 
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
 #include "backends/taskbar/unity/unity-taskbar.h"
 
 #include "common/textconsole.h"
@@ -33,7 +35,12 @@
 #include <unity.h>
 
 UnityTaskbarManager::UnityTaskbarManager() {
-	g_type_init();
+	/*
+	 *  Deprecated in Glib >= 2.36.0
+	 */
+	if (!glib_check_version(2, 36, 0)) {
+		g_type_init();
+	}
 
 	_loop = g_main_loop_new(NULL, FALSE);
 
diff --git a/backends/vkeybd/packs/vkeybd_small.zip b/backends/vkeybd/packs/vkeybd_small.zip
new file mode 100644
index 0000000000..d1c7fc75e5
--- /dev/null
+++ b/backends/vkeybd/packs/vkeybd_small.zip
diff --git a/backends/vkeybd/packs/vkeybd_small/lowercase-symbols320x240.bmp b/backends/vkeybd/packs/vkeybd_small/lowercase-symbols320x240.bmp
new file mode 100644
index 0000000000..08d40a0373
--- /dev/null
+++ b/backends/vkeybd/packs/vkeybd_small/lowercase-symbols320x240.bmp
diff --git a/backends/vkeybd/packs/vkeybd_small/lowercase320x240.bmp b/backends/vkeybd/packs/vkeybd_small/lowercase320x240.bmp
new file mode 100644
index 0000000000..25579234bb
--- /dev/null
+++ b/backends/vkeybd/packs/vkeybd_small/lowercase320x240.bmp
diff --git a/backends/vkeybd/packs/vkeybd_small/uppercase-symbols320x240.bmp b/backends/vkeybd/packs/vkeybd_small/uppercase-symbols320x240.bmp
new file mode 100644
index 0000000000..76a7f51839
--- /dev/null
+++ b/backends/vkeybd/packs/vkeybd_small/uppercase-symbols320x240.bmp
diff --git a/backends/vkeybd/packs/vkeybd_small/uppercase320x240.bmp b/backends/vkeybd/packs/vkeybd_small/uppercase320x240.bmp
new file mode 100644
index 0000000000..96ce1adbe4
--- /dev/null
+++ b/backends/vkeybd/packs/vkeybd_small/uppercase320x240.bmp
diff --git a/backends/vkeybd/packs/vkeybd_small/vkeybd_small.xml b/backends/vkeybd/packs/vkeybd_small/vkeybd_small.xml
new file mode 100644
index 0000000000..20e91fe2fc
--- /dev/null
+++ b/backends/vkeybd/packs/vkeybd_small/vkeybd_small.xml
@@ -0,0 +1,637 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<keyboard initial_mode="lowercase" v_align="bottom" h_align="center">
+<!-- coords key = "start x, start y, end x, end y" -->
+  <!-- Lowercase -->
+  <mode name="lowercase" resolutions="320x240">
+    <layout resolution="320x240" bitmap="lowercase320x240.bmp" transparent_color="255,0,255">
+      <map>
+        <area shape="rect" coords="13,8,306,20" target="display_area" />
+        <area shape="rect" coords="9,26,25,42" target="esc" />
+        <area shape="rect" coords="50,25,67,43" target="f2" />
+        <area shape="rect" coords="29,24,46,43" target="f1" />
+        <area shape="rect" coords="71,26,88,44" target="f3" />
+        <area shape="rect" coords="90,25,107,43" target="f4" />
+        <area shape="rect" coords="111,26,128,44" target="f5" />
+        <area shape="rect" coords="132,26,149,44" target="f6" />
+        <area shape="rect" coords="153,25,170,44" target="f7" />
+        <area shape="rect" coords="173,26,190,44" target="f8" />
+        <area shape="rect" coords="194,24,211,43" target="f9" />
+        <area shape="rect" coords="215,26,231,44" target="f10" />
+        <area shape="rect" coords="235,26,253,43" target="f11" />
+        <area shape="rect" coords="255,26,272,45" target="f12" />
+        <area shape="rect" coords="276,27,310,43" target="del" />
+        <area shape="rect" coords="276,46,299,65" target="delete" />
+        <area shape="rect" coords="300,46,311,65" target="backspace" />
+        <area shape="rect" coords="8,68,32,85" target="tab" />
+        <area shape="rect" coords="36,68,53,85" target="q" />
+        <area shape="rect" coords="57,68,75,86" target="w" />
+        <area shape="rect" coords="78,67,94,85" target="e" />
+        <area shape="rect" coords="98,67,115,85" target="r" />
+        <area shape="rect" coords="119,67,136,85" target="t" />
+        <area shape="rect" coords="141,68,158,86" target="y" />
+        <area shape="rect" coords="161,67,179,86" target="u" />
+        <area shape="rect" coords="182,67,199,86" target="i" />
+        <area shape="rect" coords="202,67,220,85" target="o" />
+        <area shape="rect" coords="223,68,240,86" target="p" />
+        <area shape="rect" coords="44,88,63,107" target="a" />
+        <area shape="rect" coords="65,88,84,106" target="s" />
+        <area shape="rect" coords="86,89,104,107" target="d" />
+        <area shape="rect" coords="107,89,124,107" target="f" />
+        <area shape="rect" coords="128,89,145,107" target="g" />
+        <area shape="rect" coords="149,88,165,107" target="h" />
+        <area shape="rect" coords="169,89,186,107" target="j" />
+        <area shape="rect" coords="189,89,207,107" target="k" />
+        <area shape="rect" coords="210,89,228,107" target="l" />
+        <area shape="rect" coords="273,89,311,106" target="enter" />
+        <area shape="rect" coords="9,110,50,127" target="shift" />
+        <area shape="rect" coords="8,89,41,106" target="caps" />
+        <area shape="rect" coords="58,110,75,128" target="z" />
+        <area shape="rect" coords="79,110,96,128" target="x" />
+        <area shape="rect" coords="99,109,116,127" target="c" />
+        <area shape="rect" coords="120,110,138,128" target="v" />
+        <area shape="rect" coords="141,109,157,127" target="b" />
+        <area shape="rect" coords="162,110,179,128" target="n" />
+        <area shape="rect" coords="182,110,199,128" target="m" />
+        <area shape="rect" coords="271,109,311,128" target="symbols" />
+        <area shape="rect" coords="9,130,33,148" target="ctrl" />
+        <area shape="rect" coords="38,130,61,147" target="alt" />
+        <area shape="rect" coords="67,130,262,148" target="space" />
+        <area shape="rect" coords="8,47,26,64" target="|" />
+        <area shape="rect" coords="28,47,45,64" target="1" />
+        <area shape="rect" coords="50,47,67,65" target="2" />
+        <area shape="rect" coords="70,46,87,65" target="3" />
+        <area shape="rect" coords="91,46,108,64" target="4" />
+        <area shape="rect" coords="111,46,129,65" target="5" />
+        <area shape="rect" coords="132,47,149,65" target="6" />
+        <area shape="rect" coords="152,47,170,64" target="7" />
+        <area shape="rect" coords="174,46,191,63" target="8" />
+        <area shape="rect" coords="194,47,211,65" target="9" />
+        <area shape="rect" coords="215,46,232,64" target="0" />
+        <area shape="rect" coords="235,47,252,65" target="-" />
+        <area shape="rect" coords="255,46,272,65" target="=" />
+        <area shape="rect" coords="244,68,261,86" target="[" />
+        <area shape="rect" coords="264,67,282,86" target="]" />
+        <area shape="rect" coords="284,68,309,86" target="#" />
+        <area shape="rect" coords="231,88,249,106" target=";" />
+        <area shape="rect" coords="251,89,269,107" target="’" />
+        <area shape="rect" coords="202,110,219,128" target="," />
+        <area shape="rect" coords="223,110,241,128" target="." />
+        <area shape="rect" coords="243,110,261,128" target="/" />
+        <area shape="rect" coords="269,131,288,150" target="ok" />
+        <area shape="rect" coords="292,131,311,150" target="cancel" />
+      </map>
+    </layout>
+    <event name="esc" type="key" code="27" ascii="27" modifiers="" />
+    <event name="f1" type="key" code="282" ascii="315" modifiers="" />
+    <event name="f2" type="key" code="283" ascii="316" modifiers="" />
+    <event name="f3" type="key" code="284" ascii="317" modifiers="" />
+    <event name="f4" type="key" code="285" ascii="318" modifiers="" />
+    <event name="f5" type="key" code="286" ascii="319" modifiers="" />
+    <event name="f6" type="key" code="287" ascii="320" modifiers="" />
+    <event name="f7" type="key" code="288" ascii="321" modifiers="" />
+    <event name="f8" type="key" code="289" ascii="322" modifiers="" />
+    <event name="f9" type="key" code="290" ascii="323" modifiers="" />
+    <event name="f10" type="key" code="291" ascii="324" modifiers="" />
+    <event name="f11" type="key" code="292" ascii="325" modifiers="" />
+    <event name="f12" type="key" code="293" ascii="326" modifiers="" />
+    <event name="del" type="key" code="127" ascii="0" modifiers="" />
+    <event name="ctrl" type="modifier" modifiers="ctrl" />
+    <event name="alt" type="modifier" modifiers="alt" />
+    <event name="shift" type="modifier" modifiers="shift" />
+    <event name="caps" type="switch_mode" mode="uppercase" />
+    <event name="symbols" type="switch_mode" mode="lowercasesymbols" />
+    <event name="backspace" type="key" code="8" ascii="8" modifiers="" />
+    <event name="enter" type="key" code="13" ascii="13" modifiers="" />
+    <event name="|" type="key" code="124" ascii="124" modifiers="" />
+    <event name="-" type="key" code="45" ascii="45" modifiers="" />
+    <event name="=" type="key" code="61" ascii="61" modifiers="" />
+    <event name="[" type="key" code="91" ascii="91" modifiers="" />
+    <event name="]" type="key" code="93" ascii="93" modifiers="" />
+    <event name="#" type="key" code="35" ascii="35" modifiers="" />
+    <event name=";" type="key" code="59" ascii="59" modifiers="" />
+    <event name="'" type="key" code="39" ascii="39" modifiers="" />
+    <event name="," type="key" code="44" ascii="44" modifiers="" />
+    <event name="." type="key" code="46" ascii="46" modifiers="" />
+    <event name="/" type="key" code="47" ascii="47" modifiers="" />
+    <event name="space" type="key" code="32" ascii="32" modifiers="" />
+    <event name="tab" type="key" code="9" ascii="9" modifiers="" />
+    <event name="a" type="key" code="97" ascii="97" modifiers="" />
+    <event name="b" type="key" code="98" ascii="98" modifiers="" />
+    <event name="c" type="key" code="99" ascii="99" modifiers="" />
+    <event name="d" type="key" code="100" ascii="100" modifiers="" />
+    <event name="e" type="key" code="101" ascii="101" modifiers="" />
+    <event name="f" type="key" code="102" ascii="102" modifiers="" />
+    <event name="g" type="key" code="103" ascii="103" modifiers="" />
+    <event name="h" type="key" code="104" ascii="104" modifiers="" />
+    <event name="i" type="key" code="105" ascii="105" modifiers="" />
+    <event name="j" type="key" code="106" ascii="106" modifiers="" />
+    <event name="k" type="key" code="107" ascii="107" modifiers="" />
+    <event name="l" type="key" code="108" ascii="108" modifiers="" />
+    <event name="m" type="key" code="109" ascii="109" modifiers="" />
+    <event name="n" type="key" code="110" ascii="110" modifiers="" />
+    <event name="o" type="key" code="111" ascii="111" modifiers="" />
+    <event name="p" type="key" code="112" ascii="112" modifiers="" />
+    <event name="q" type="key" code="113" ascii="113" modifiers="" />
+    <event name="r" type="key" code="114" ascii="114" modifiers="" />
+    <event name="s" type="key" code="115" ascii="115" modifiers="" />
+    <event name="t" type="key" code="116" ascii="116" modifiers="" />
+    <event name="u" type="key" code="117" ascii="117" modifiers="" />
+    <event name="v" type="key" code="118" ascii="118" modifiers="" />
+    <event name="w" type="key" code="119" ascii="119" modifiers="" />
+    <event name="x" type="key" code="120" ascii="120" modifiers="" />
+    <event name="y" type="key" code="121" ascii="121" modifiers="" />
+    <event name="z" type="key" code="122" ascii="122" modifiers="" />
+    <event name="0" type="key" code="48" ascii="48" modifiers="" />
+    <event name="1" type="key" code="49" ascii="49" modifiers="" />
+    <event name="2" type="key" code="50" ascii="50" modifiers="" />
+    <event name="3" type="key" code="51" ascii="51" modifiers="" />
+    <event name="4" type="key" code="52" ascii="52" modifiers="" />
+    <event name="5" type="key" code="53" ascii="53" modifiers="" />
+    <event name="6" type="key" code="54" ascii="54" modifiers="" />
+    <event name="7" type="key" code="55" ascii="55" modifiers="" />
+    <event name="8" type="key" code="56" ascii="56" modifiers="" />
+    <event name="9" type="key" code="57" ascii="57" modifiers="" />
+    <event name="ok" type="submit" />
+    <event name="cancel" type="cancel" />
+    <event name="quit" type="submit" />
+    <event name="delete" type="delete" />
+  </mode>
+
+  <!-- Uppercase -->
+  <mode name="uppercase" resolutions="320x240">
+    <layout resolution="320x240" bitmap="uppercase320x240.bmp" transparent_color="255,0,255">
+      <map>
+        <area shape="rect" coords="13,8,306,20" target="display_area" />
+        <area shape="rect" coords="9,26,25,42" target="esc" />
+        <area shape="rect" coords="50,25,67,43" target="f2" />
+        <area shape="rect" coords="29,24,46,43" target="f1" />
+        <area shape="rect" coords="71,26,88,44" target="f3" />
+        <area shape="rect" coords="90,25,107,43" target="f4" />
+        <area shape="rect" coords="111,26,128,44" target="f5" />
+        <area shape="rect" coords="132,26,149,44" target="f6" />
+        <area shape="rect" coords="153,25,170,44" target="f7" />
+        <area shape="rect" coords="173,26,190,44" target="f8" />
+        <area shape="rect" coords="194,24,211,43" target="f9" />
+        <area shape="rect" coords="215,26,231,44" target="f10" />
+        <area shape="rect" coords="235,26,253,43" target="f11" />
+        <area shape="rect" coords="255,26,272,45" target="f12" />
+        <area shape="rect" coords="276,27,310,43" target="del" />
+        <area shape="rect" coords="276,46,299,65" target="delete" />
+        <area shape="rect" coords="300,46,311,65" target="backspace" />
+        <area shape="rect" coords="8,68,32,85" target="tab" />
+        <area shape="rect" coords="36,68,53,85" target="Q" />
+        <area shape="rect" coords="57,68,75,86" target="W" />
+        <area shape="rect" coords="78,67,94,85" target="E" />
+        <area shape="rect" coords="98,67,115,85" target="R" />
+        <area shape="rect" coords="119,67,136,85" target="T" />
+        <area shape="rect" coords="141,68,158,86" target="Y" />
+        <area shape="rect" coords="161,67,179,86" target="U" />
+        <area shape="rect" coords="182,67,199,86" target="I" />
+        <area shape="rect" coords="202,67,220,85" target="O" />
+        <area shape="rect" coords="223,68,240,86" target="P" />
+        <area shape="rect" coords="44,88,63,107" target="A" />
+        <area shape="rect" coords="65,88,84,106" target="S" />
+        <area shape="rect" coords="86,89,104,107" target="D" />
+        <area shape="rect" coords="107,89,124,107" target="F" />
+        <area shape="rect" coords="128,89,145,107" target="G" />
+        <area shape="rect" coords="149,88,165,107" target="H" />
+        <area shape="rect" coords="169,89,186,107" target="J" />
+        <area shape="rect" coords="189,89,207,107" target="K" />
+        <area shape="rect" coords="210,89,228,107" target="L" />
+        <area shape="rect" coords="273,89,311,106" target="enter" />
+        <area shape="rect" coords="9,110,50,127" target="shift" />
+        <area shape="rect" coords="8,89,41,106" target="caps" />
+        <area shape="rect" coords="58,110,75,128" target="Z" />
+        <area shape="rect" coords="79,110,96,128" target="X" />
+        <area shape="rect" coords="99,109,116,127" target="C" />
+        <area shape="rect" coords="120,110,138,128" target="V" />
+        <area shape="rect" coords="141,109,157,127" target="B" />
+        <area shape="rect" coords="162,110,179,128" target="N" />
+        <area shape="rect" coords="182,110,199,128" target="M" />
+        <area shape="rect" coords="271,109,311,128" target="symbols" />
+        <area shape="rect" coords="9,130,33,148" target="ctrl" />
+        <area shape="rect" coords="38,130,61,147" target="alt" />
+        <area shape="rect" coords="67,130,262,148" target="space" />
+        <area shape="rect" coords="8,47,26,64" target="|" />
+        <area shape="rect" coords="28,47,45,64" target="1" />
+        <area shape="rect" coords="50,47,67,65" target="2" />
+        <area shape="rect" coords="70,46,87,65" target="3" />
+        <area shape="rect" coords="91,46,108,64" target="4" />
+        <area shape="rect" coords="111,46,129,65" target="5" />
+        <area shape="rect" coords="132,47,149,65" target="6" />
+        <area shape="rect" coords="152,47,170,64" target="7" />
+        <area shape="rect" coords="174,46,191,63" target="8" />
+        <area shape="rect" coords="194,47,211,65" target="9" />
+        <area shape="rect" coords="215,46,232,64" target="0" />
+        <area shape="rect" coords="235,47,252,65" target="-" />
+        <area shape="rect" coords="255,46,272,65" target="=" />
+        <area shape="rect" coords="244,68,261,86" target="[" />
+        <area shape="rect" coords="264,67,282,86" target="]" />
+        <area shape="rect" coords="284,68,309,86" target="#" />
+        <area shape="rect" coords="231,88,249,106" target=";" />
+        <area shape="rect" coords="251,89,269,107" target="’" />
+        <area shape="rect" coords="202,110,219,128" target="," />
+        <area shape="rect" coords="223,110,241,128" target="." />
+        <area shape="rect" coords="243,110,261,128" target="/" />
+        <area shape="rect" coords="269,131,288,150" target="ok" />
+        <area shape="rect" coords="292,131,311,150" target="cancel" />
+      </map>
+    </layout>
+    <event name="esc" type="key" code="27" ascii="27" modifiers="" />
+    <event name="f1" type="key" code="282" ascii="315" modifiers="" />
+    <event name="f2" type="key" code="283" ascii="316" modifiers="" />
+    <event name="f3" type="key" code="284" ascii="317" modifiers="" />
+    <event name="f4" type="key" code="285" ascii="318" modifiers="" />
+    <event name="f5" type="key" code="286" ascii="319" modifiers="" />
+    <event name="f6" type="key" code="287" ascii="320" modifiers="" />
+    <event name="f7" type="key" code="288" ascii="321" modifiers="" />
+    <event name="f8" type="key" code="289" ascii="322" modifiers="" />
+    <event name="f9" type="key" code="290" ascii="323" modifiers="" />
+    <event name="f10" type="key" code="291" ascii="324" modifiers="" />
+    <event name="f11" type="key" code="292" ascii="325" modifiers="" />
+    <event name="f12" type="key" code="293" ascii="326" modifiers="" />
+    <event name="del" type="key" code="127" ascii="0" modifiers="" />
+    <event name="ctrl" type="modifier" modifiers="ctrl" />
+    <event name="alt" type="modifier" modifiers="alt" />
+    <event name="shift" type="modifier" modifiers="shift" />
+    <event name="caps" type="switch_mode" mode="lowercase" />
+    <event name="symbols" type="switch_mode" mode="uppercasesymbols" />
+    <event name="backspace" type="key" code="8" ascii="8" modifiers="" />
+    <event name="enter" type="key" code="13" ascii="13" modifiers="" />
+    <event name="|" type="key" code="124" ascii="124" modifiers="" />
+    <event name="-" type="key" code="45" ascii="45" modifiers="" />
+    <event name="=" type="key" code="61" ascii="61" modifiers="" />
+    <event name="[" type="key" code="91" ascii="91" modifiers="" />
+    <event name="]" type="key" code="93" ascii="93" modifiers="" />
+    <event name="#" type="key" code="35" ascii="35" modifiers="" />
+    <event name=";" type="key" code="59" ascii="59" modifiers="" />
+    <event name="'" type="key" code="39" ascii="39" modifiers="" />
+    <event name="," type="key" code="44" ascii="44" modifiers="" />
+    <event name="." type="key" code="46" ascii="46" modifiers="" />
+    <event name="/" type="key" code="47" ascii="47" modifiers="" />
+    <event name="space" type="key" code="32" ascii="32" modifiers="" />
+    <event name="tab" type="key" code="9" ascii="9" modifiers="" />
+    <event name="A" type="key" code="97" ascii="65" modifiers="shift" />
+    <event name="B" type="key" code="98" ascii="66" modifiers="shift" />
+    <event name="C" type="key" code="99" ascii="67" modifiers="shift" />
+    <event name="D" type="key" code="100" ascii="68" modifiers="shift" />
+    <event name="E" type="key" code="101" ascii="69" modifiers="shift" />
+    <event name="F" type="key" code="102" ascii="70" modifiers="shift" />
+    <event name="G" type="key" code="103" ascii="71" modifiers="shift" />
+    <event name="H" type="key" code="104" ascii="72" modifiers="shift" />
+    <event name="I" type="key" code="105" ascii="73" modifiers="shift" />
+    <event name="J" type="key" code="106" ascii="74" modifiers="shift" />
+    <event name="K" type="key" code="107" ascii="75" modifiers="shift" />
+    <event name="L" type="key" code="108" ascii="76" modifiers="shift" />
+    <event name="M" type="key" code="109" ascii="77" modifiers="shift" />
+    <event name="N" type="key" code="110" ascii="78" modifiers="shift" />
+    <event name="O" type="key" code="111" ascii="79" modifiers="shift" />
+    <event name="P" type="key" code="112" ascii="80" modifiers="shift" />
+    <event name="Q" type="key" code="113" ascii="81" modifiers="shift" />
+    <event name="R" type="key" code="114" ascii="82" modifiers="shift" />
+    <event name="S" type="key" code="115" ascii="83" modifiers="shift" />
+    <event name="T" type="key" code="116" ascii="84" modifiers="shift" />
+    <event name="U" type="key" code="117" ascii="85" modifiers="shift" />
+    <event name="V" type="key" code="118" ascii="86" modifiers="shift" />
+    <event name="W" type="key" code="119" ascii="87" modifiers="shift" />
+    <event name="X" type="key" code="120" ascii="88" modifiers="shift" />
+    <event name="Y" type="key" code="121" ascii="89" modifiers="shift" />
+    <event name="Z" type="key" code="122" ascii="90" modifiers="shift" />
+    <event name="0" type="key" code="48" ascii="48" modifiers="" />
+    <event name="1" type="key" code="49" ascii="49" modifiers="" />
+    <event name="2" type="key" code="50" ascii="50" modifiers="" />
+    <event name="3" type="key" code="51" ascii="51" modifiers="" />
+    <event name="4" type="key" code="52" ascii="52" modifiers="" />
+    <event name="5" type="key" code="53" ascii="53" modifiers="" />
+    <event name="6" type="key" code="54" ascii="54" modifiers="" />
+    <event name="7" type="key" code="55" ascii="55" modifiers="" />
+    <event name="8" type="key" code="56" ascii="56" modifiers="" />
+    <event name="9" type="key" code="57" ascii="57" modifiers="" />
+    <event name="ok" type="submit" />
+    <event name="cancel" type="cancel" />
+    <event name="quit" type="submit" />
+    <event name="delete" type="delete" />
+  </mode>
+
+  <!-- Lowercase Symbols -->
+  <mode name="lowercasesymbols" resolutions="320x240">
+    <layout resolution="320x240" bitmap="lowercase-symbols320x240.bmp" transparent_color="255,0,255">
+      <map>
+        <area shape="rect" coords="13,8,306,20" target="display_area" />
+        <area shape="rect" coords="9,26,25,42" target="esc" />
+        <area shape="rect" coords="50,25,67,43" target="f2" />
+        <area shape="rect" coords="29,24,46,43" target="f1" />
+        <area shape="rect" coords="71,26,88,44" target="f3" />
+        <area shape="rect" coords="90,25,107,43" target="f4" />
+        <area shape="rect" coords="111,26,128,44" target="f5" />
+        <area shape="rect" coords="132,26,149,44" target="f6" />
+        <area shape="rect" coords="153,25,170,44" target="f7" />
+        <area shape="rect" coords="173,26,190,44" target="f8" />
+        <area shape="rect" coords="194,24,211,43" target="f9" />
+        <area shape="rect" coords="215,26,231,44" target="f10" />
+        <area shape="rect" coords="235,26,253,43" target="f11" />
+        <area shape="rect" coords="255,26,272,45" target="f12" />
+        <area shape="rect" coords="276,27,310,43" target="del" />
+        <area shape="rect" coords="8,47,26,64" target="¬" />
+        <area shape="rect" coords="28,47,45,64" target="!" />
+        <area shape="rect" coords="50,47,67,65" target="quote" />
+        <area shape="rect" coords="70,46,87,65" target="£" />
+        <area shape="rect" coords="91,46,108,64" target="$" />
+        <area shape="rect" coords="111,46,129,65" target="%" />
+        <area shape="rect" coords="132,47,149,65" target="^" />
+        <area shape="rect" coords="152,47,170,64" target="&amp;" />
+        <area shape="rect" coords="174,46,191,63" target="*" />
+        <area shape="rect" coords="194,47,211,65" target="(" />
+        <area shape="rect" coords="215,46,232,64" target=")" />
+        <area shape="rect" coords="235,47,252,65" target="_" />
+        <area shape="rect" coords="255,46,272,65" target="+" />
+        <area shape="rect" coords="276,46,299,65" target="delete" />
+        <area shape="rect" coords="300,46,311,65" target="backspace" />
+        <area shape="rect" coords="8,68,32,85" target="tab" />
+        <area shape="rect" coords="36,68,53,85" target="q" />
+        <area shape="rect" coords="57,68,75,86" target="w" />
+        <area shape="rect" coords="78,67,94,85" target="e" />
+        <area shape="rect" coords="98,67,115,85" target="r" />
+        <area shape="rect" coords="119,67,136,85" target="t" />
+        <area shape="rect" coords="141,68,158,86" target="y" />
+        <area shape="rect" coords="161,67,179,86" target="u" />
+        <area shape="rect" coords="182,67,199,86" target="i" />
+        <area shape="rect" coords="202,67,220,85" target="o" />
+        <area shape="rect" coords="223,68,240,86" target="p" />
+        <area shape="rect" coords="244,68,261,86" target="{" />
+        <area shape="rect" coords="264,67,282,86" target="}" />
+        <area shape="rect" coords="284,68,309,86" target="~" />
+        <area shape="rect" coords="8,89,41,106" target="caps" />
+        <area shape="rect" coords="44,88,63,107" target="a" />
+        <area shape="rect" coords="65,88,84,106" target="s" />
+        <area shape="rect" coords="86,89,104,107" target="d" />
+        <area shape="rect" coords="107,89,124,107" target="f" />
+        <area shape="rect" coords="128,89,145,107" target="g" />
+        <area shape="rect" coords="149,88,165,107" target="h" />
+        <area shape="rect" coords="169,89,186,107" target="j" />
+        <area shape="rect" coords="189,89,207,107" target="k" />
+        <area shape="rect" coords="210,89,228,107" target="l" />
+        <area shape="rect" coords="231,88,249,106" target=":" />
+        <area shape="rect" coords="251,89,269,107" target="@" />
+        <area shape="rect" coords="273,89,311,106" target="enter" />
+        <area shape="rect" coords="9,110,50,127" target="shift" />
+        <area shape="rect" coords="58,110,75,128" target="z" />
+        <area shape="rect" coords="79,110,96,128" target="x" />
+        <area shape="rect" coords="99,109,116,127" target="c" />
+        <area shape="rect" coords="120,110,138,128" target="v" />
+        <area shape="rect" coords="141,109,157,127" target="b" />
+        <area shape="rect" coords="162,110,179,128" target="n" />
+        <area shape="rect" coords="182,110,199,128" target="m" />
+        <area shape="rect" coords="202,110,219,128" target="&lt;" />
+        <area shape="rect" coords="223,110,241,128" target="&gt;" />
+        <area shape="rect" coords="243,110,261,128" target="?" />
+        <area shape="rect" coords="271,109,311,128" target="symbols" />
+        <area shape="rect" coords="9,130,33,148" target="ctrl" />
+        <area shape="rect" coords="38,130,61,147" target="alt" />
+        <area shape="rect" coords="67,130,262,148" target="space" />
+        <area shape="rect" coords="269,131,288,150" target="ok" />
+        <area shape="rect" coords="292,131,311,150" target="cancel" />
+      </map>
+    </layout>
+    <event name="esc" type="key" code="27" ascii="27" modifiers="" />
+    <event name="f1" type="key" code="282" ascii="315" modifiers="" />
+    <event name="f2" type="key" code="283" ascii="316" modifiers="" />
+    <event name="f3" type="key" code="284" ascii="317" modifiers="" />
+    <event name="f4" type="key" code="285" ascii="318" modifiers="" />
+    <event name="f5" type="key" code="286" ascii="319" modifiers="" />
+    <event name="f6" type="key" code="287" ascii="320" modifiers="" />
+    <event name="f7" type="key" code="288" ascii="321" modifiers="" />
+    <event name="f8" type="key" code="289" ascii="322" modifiers="" />
+    <event name="f9" type="key" code="290" ascii="323" modifiers="" />
+    <event name="f10" type="key" code="291" ascii="324" modifiers="" />
+    <event name="f11" type="key" code="292" ascii="325" modifiers="" />
+    <event name="f12" type="key" code="293" ascii="326" modifiers="" />
+    <event name="del" type="key" code="127" ascii="0" modifiers="" />
+    <event name="ctrl" type="modifier" modifiers="ctrl" />
+    <event name="alt" type="modifier" modifiers="alt" />
+    <event name="shift" type="modifier" modifiers="shift" />
+    <event name="symbols" type="switch_mode" mode="lowercase" />
+    <event name="caps" type="switch_mode" mode="uppercasesymbols" />
+    <event name="backspace" type="key" code="8" ascii="8" modifiers="" />
+    <event name="enter" type="key" code="13" ascii="13" modifiers="" />
+    <event name="quote" type="key" code="34" ascii="34" modifiers="" />
+    <event name="£" type="key" code="163" ascii="163" modifiers="" />
+    <event name="$" type="key" code="36" ascii="36" modifiers="" />
+    <event name="%" type="key" code="37" ascii="37" modifiers="" />
+    <event name="^" type="key" code="94" ascii="94" modifiers="" />
+    <event name="&amp;" type="key" code="38" ascii="38" modifiers="" />
+    <event name="*" type="key" code="42" ascii="42" modifiers="" />
+    <event name="(" type="key" code="40" ascii="40" modifiers="" />
+    <event name=")" type="key" code="41" ascii="41" modifiers="" />
+    <event name="_" type="key" code="95" ascii="95" modifiers="" />
+    <event name="+" type="key" code="43" ascii="43" modifiers="" />
+    <event name="¬" type="key" code="172" ascii="172" modifiers="" />
+    <event name="!" type="key" code="33" ascii="33" modifiers="" />
+    <event name="{" type="key" code="123" ascii="123" modifiers="" />
+    <event name="}" type="key" code="125" ascii="125" modifiers="" />
+    <event name="~" type="key" code="126" ascii="126" modifiers="" />
+    <event name=":" type="key" code="58" ascii="58" modifiers="" />
+    <event name="@" type="key" code="64" ascii="64" modifiers="" />
+    <event name="&lt;" type="key" code="60" ascii="60" modifiers="" />
+    <event name="&gt;" type="key" code="62" ascii="62" modifiers="" />
+    <event name="?" type="key" code="63" ascii="63" modifiers="" />
+    <event name="space" type="key" code="32" ascii="32" modifiers="" />
+    <event name="tab" type="key" code="9" ascii="9" modifiers="" />
+    <event name="a" type="key" code="97" ascii="97" modifiers="" />
+    <event name="b" type="key" code="98" ascii="98" modifiers="" />
+    <event name="c" type="key" code="99" ascii="99" modifiers="" />
+    <event name="d" type="key" code="100" ascii="100" modifiers="" />
+    <event name="e" type="key" code="101" ascii="101" modifiers="" />
+    <event name="f" type="key" code="102" ascii="102" modifiers="" />
+    <event name="g" type="key" code="103" ascii="103" modifiers="" />
+    <event name="h" type="key" code="104" ascii="104" modifiers="" />
+    <event name="i" type="key" code="105" ascii="105" modifiers="" />
+    <event name="j" type="key" code="106" ascii="106" modifiers="" />
+    <event name="k" type="key" code="107" ascii="107" modifiers="" />
+    <event name="l" type="key" code="108" ascii="108" modifiers="" />
+    <event name="m" type="key" code="109" ascii="109" modifiers="" />
+    <event name="n" type="key" code="110" ascii="110" modifiers="" />
+    <event name="o" type="key" code="111" ascii="111" modifiers="" />
+    <event name="p" type="key" code="112" ascii="112" modifiers="" />
+    <event name="q" type="key" code="113" ascii="113" modifiers="" />
+    <event name="r" type="key" code="114" ascii="114" modifiers="" />
+    <event name="s" type="key" code="115" ascii="115" modifiers="" />
+    <event name="t" type="key" code="116" ascii="116" modifiers="" />
+    <event name="u" type="key" code="117" ascii="117" modifiers="" />
+    <event name="v" type="key" code="118" ascii="118" modifiers="" />
+    <event name="w" type="key" code="119" ascii="119" modifiers="" />
+    <event name="x" type="key" code="120" ascii="120" modifiers="" />
+    <event name="y" type="key" code="121" ascii="121" modifiers="" />
+    <event name="z" type="key" code="122" ascii="122" modifiers="" />
+    <event name="ok" type="submit" />
+    <event name="cancel" type="cancel" />
+    <event name="quit" type="submit" />
+    <event name="delete" type="delete" />
+  </mode>
+
+  <!-- Uppercase Symbols -->
+  <mode name="uppercasesymbols" resolutions="320x240">
+    <layout resolution="320x240" bitmap="uppercase-symbols320x240.bmp" transparent_color="255,0,255">
+      <map>
+        <area shape="rect" coords="13,8,306,20" target="display_area" />
+        <area shape="rect" coords="9,26,25,42" target="esc" />
+        <area shape="rect" coords="50,25,67,43" target="f2" />
+        <area shape="rect" coords="29,24,46,43" target="f1" />
+        <area shape="rect" coords="71,26,88,44" target="f3" />
+        <area shape="rect" coords="90,25,107,43" target="f4" />
+        <area shape="rect" coords="111,26,128,44" target="f5" />
+        <area shape="rect" coords="132,26,149,44" target="f6" />
+        <area shape="rect" coords="153,25,170,44" target="f7" />
+        <area shape="rect" coords="173,26,190,44" target="f8" />
+        <area shape="rect" coords="194,24,211,43" target="f9" />
+        <area shape="rect" coords="215,26,231,44" target="f10" />
+        <area shape="rect" coords="235,26,253,43" target="f11" />
+        <area shape="rect" coords="255,26,272,45" target="f12" />
+        <area shape="rect" coords="276,27,310,43" target="del" />
+        <area shape="rect" coords="8,47,26,64" target="¬" />
+        <area shape="rect" coords="28,47,45,64" target="!" />
+        <area shape="rect" coords="50,47,67,65" target="quote" />
+        <area shape="rect" coords="70,46,87,65" target="£" />
+        <area shape="rect" coords="91,46,108,64" target="$" />
+        <area shape="rect" coords="111,46,129,65" target="%" />
+        <area shape="rect" coords="132,47,149,65" target="^" />
+        <area shape="rect" coords="152,47,170,64" target="&amp;" />
+        <area shape="rect" coords="174,46,191,63" target="*" />
+        <area shape="rect" coords="194,47,211,65" target="(" />
+        <area shape="rect" coords="215,46,232,64" target=")" />
+        <area shape="rect" coords="235,47,252,65" target="_" />
+        <area shape="rect" coords="255,46,272,65" target="+" />
+        <area shape="rect" coords="276,46,299,65" target="delete" />
+        <area shape="rect" coords="300,46,311,65" target="backspace" />
+        <area shape="rect" coords="8,68,32,85" target="tab" />
+        <area shape="rect" coords="36,68,53,85" target="Q" />
+        <area shape="rect" coords="57,68,75,86" target="W" />
+        <area shape="rect" coords="78,67,94,85" target="E" />
+        <area shape="rect" coords="98,67,115,85" target="R" />
+        <area shape="rect" coords="119,67,136,85" target="T" />
+        <area shape="rect" coords="141,68,158,86" target="Y" />
+        <area shape="rect" coords="161,67,179,86" target="U" />
+        <area shape="rect" coords="182,67,199,86" target="I" />
+        <area shape="rect" coords="202,67,220,85" target="O" />
+        <area shape="rect" coords="223,68,240,86" target="P" />
+        <area shape="rect" coords="244,68,261,86" target="{" />
+        <area shape="rect" coords="264,67,282,86" target="}" />
+        <area shape="rect" coords="284,68,309,86" target="~" />
+        <area shape="rect" coords="8,89,41,106" target="caps" />
+        <area shape="rect" coords="44,88,63,107" target="A" />
+        <area shape="rect" coords="65,88,84,106" target="S" />
+        <area shape="rect" coords="86,89,104,107" target="D" />
+        <area shape="rect" coords="107,89,124,107" target="F" />
+        <area shape="rect" coords="128,89,145,107" target="G" />
+        <area shape="rect" coords="149,88,165,107" target="H" />
+        <area shape="rect" coords="169,89,186,107" target="J" />
+        <area shape="rect" coords="189,89,207,107" target="K" />
+        <area shape="rect" coords="210,89,228,107" target="L" />
+        <area shape="rect" coords="231,88,249,106" target=":" />
+        <area shape="rect" coords="251,89,269,107" target="@" />
+        <area shape="rect" coords="273,89,311,106" target="enter" />
+        <area shape="rect" coords="9,110,50,127" target="shift" />
+        <area shape="rect" coords="58,110,75,128" target="z" />
+        <area shape="rect" coords="79,110,96,128" target="x" />
+        <area shape="rect" coords="99,109,116,127" target="c" />
+        <area shape="rect" coords="120,110,138,128" target="v" />
+        <area shape="rect" coords="141,109,157,127" target="b" />
+        <area shape="rect" coords="162,110,179,128" target="n" />
+        <area shape="rect" coords="182,110,199,128" target="m" />
+        <area shape="rect" coords="202,110,219,128" target="&lt;" />
+        <area shape="rect" coords="223,110,241,128" target="&gt;" />
+        <area shape="rect" coords="243,110,261,128" target="?" />
+        <area shape="rect" coords="271,109,311,128" target="symbols" />
+        <area shape="rect" coords="9,130,33,148" target="ctrl" />
+        <area shape="rect" coords="38,130,61,147" target="alt" />
+        <area shape="rect" coords="67,130,262,148" target="space" />
+        <area shape="rect" coords="269,131,288,150" target="ok" />
+        <area shape="rect" coords="292,131,311,150" target="cancel" />
+      </map>
+    </layout>
+    <event name="esc" type="key" code="27" ascii="27" modifiers="" />
+    <event name="f1" type="key" code="282" ascii="315" modifiers="" />
+    <event name="f2" type="key" code="283" ascii="316" modifiers="" />
+    <event name="f3" type="key" code="284" ascii="317" modifiers="" />
+    <event name="f4" type="key" code="285" ascii="318" modifiers="" />
+    <event name="f5" type="key" code="286" ascii="319" modifiers="" />
+    <event name="f6" type="key" code="287" ascii="320" modifiers="" />
+    <event name="f7" type="key" code="288" ascii="321" modifiers="" />
+    <event name="f8" type="key" code="289" ascii="322" modifiers="" />
+    <event name="f9" type="key" code="290" ascii="323" modifiers="" />
+    <event name="f10" type="key" code="291" ascii="324" modifiers="" />
+    <event name="f11" type="key" code="292" ascii="325" modifiers="" />
+    <event name="f12" type="key" code="293" ascii="326" modifiers="" />
+    <event name="del" type="key" code="127" ascii="0" modifiers="" />
+    <event name="ctrl" type="modifier" modifiers="ctrl" />
+    <event name="alt" type="modifier" modifiers="alt" />
+    <event name="shift" type="switch_mode" mode="shiftlowercase" />
+    <event name="caps" type="switch_mode" mode="lowercasesymbols" />
+    <event name="symbols" type="switch_mode" mode="uppercase" />
+    <event name="backspace" type="key" code="8" ascii="8" modifiers="" />
+    <event name="enter" type="key" code="13" ascii="13" modifiers="" />
+    <event name="quote" type="key" code="34" ascii="34" modifiers="" />
+    <event name="£" type="key" code="163" ascii="163" modifiers="" />
+    <event name="$" type="key" code="36" ascii="36" modifiers="" />
+    <event name="%" type="key" code="37" ascii="37" modifiers="" />
+    <event name="^" type="key" code="94" ascii="94" modifiers="" />
+    <event name="&amp;" type="key" code="38" ascii="38" modifiers="" />
+    <event name="*" type="key" code="42" ascii="42" modifiers="" />
+    <event name="(" type="key" code="40" ascii="40" modifiers="" />
+    <event name=")" type="key" code="41" ascii="41" modifiers="" />
+    <event name="_" type="key" code="95" ascii="95" modifiers="" />
+    <event name="+" type="key" code="43" ascii="43" modifiers="" />
+    <event name="¬" type="key" code="172" ascii="172" modifiers="" />
+    <event name="!" type="key" code="33" ascii="33" modifiers="" />
+    <event name="{" type="key" code="123" ascii="123" modifiers="" />
+    <event name="}" type="key" code="125" ascii="125" modifiers="" />
+    <event name="~" type="key" code="126" ascii="126" modifiers="" />
+    <event name=":" type="key" code="58" ascii="58" modifiers="" />
+    <event name="@" type="key" code="64" ascii="64" modifiers="" />
+    <event name="&lt;" type="key" code="60" ascii="60" modifiers="" />
+    <event name="&gt;" type="key" code="62" ascii="62" modifiers="" />
+    <event name="?" type="key" code="63" ascii="63" modifiers="" />
+    <event name="space" type="key" code="32" ascii="32" modifiers="" />
+    <event name="tab" type="key" code="9" ascii="9" modifiers="" />
+    <event name="A" type="key" code="97" ascii="65" modifiers="shift" />
+    <event name="B" type="key" code="98" ascii="66" modifiers="shift" />
+    <event name="C" type="key" code="99" ascii="67" modifiers="shift" />
+    <event name="D" type="key" code="100" ascii="68" modifiers="shift" />
+    <event name="E" type="key" code="101" ascii="69" modifiers="shift" />
+    <event name="F" type="key" code="102" ascii="70" modifiers="shift" />
+    <event name="G" type="key" code="103" ascii="71" modifiers="shift" />
+    <event name="H" type="key" code="104" ascii="72" modifiers="shift" />
+    <event name="I" type="key" code="105" ascii="73" modifiers="shift" />
+    <event name="J" type="key" code="106" ascii="74" modifiers="shift" />
+    <event name="K" type="key" code="107" ascii="75" modifiers="shift" />
+    <event name="L" type="key" code="108" ascii="76" modifiers="shift" />
+    <event name="M" type="key" code="109" ascii="77" modifiers="shift" />
+    <event name="N" type="key" code="110" ascii="78" modifiers="shift" />
+    <event name="O" type="key" code="111" ascii="79" modifiers="shift" />
+    <event name="P" type="key" code="112" ascii="80" modifiers="shift" />
+    <event name="Q" type="key" code="113" ascii="81" modifiers="shift" />
+    <event name="R" type="key" code="114" ascii="82" modifiers="shift" />
+    <event name="S" type="key" code="115" ascii="83" modifiers="shift" />
+    <event name="T" type="key" code="116" ascii="84" modifiers="shift" />
+    <event name="U" type="key" code="117" ascii="85" modifiers="shift" />
+    <event name="V" type="key" code="118" ascii="86" modifiers="shift" />
+    <event name="W" type="key" code="119" ascii="87" modifiers="shift" />
+    <event name="X" type="key" code="120" ascii="88" modifiers="shift" />
+    <event name="Y" type="key" code="121" ascii="89" modifiers="shift" />
+    <event name="Z" type="key" code="122" ascii="90" modifiers="shift" />
+    <event name="0" type="key" code="48" ascii="48" modifiers="" />
+    <event name="1" type="key" code="49" ascii="49" modifiers="" />
+    <event name="2" type="key" code="50" ascii="50" modifiers="" />
+    <event name="3" type="key" code="51" ascii="51" modifiers="" />
+    <event name="4" type="key" code="52" ascii="52" modifiers="" />
+    <event name="5" type="key" code="53" ascii="53" modifiers="" />
+    <event name="6" type="key" code="54" ascii="54" modifiers="" />
+    <event name="7" type="key" code="55" ascii="55" modifiers="" />
+    <event name="8" type="key" code="56" ascii="56" modifiers="" />
+    <event name="9" type="key" code="57" ascii="57" modifiers="" />
+    <event name="ok" type="submit" />
+    <event name="cancel" type="cancel" />
+    <event name="quit" type="submit" />
+    <event name="delete" type="delete" />
+  </mode>
+</keyboard>
diff --git a/backends/vkeybd/virtual-keyboard.cpp b/backends/vkeybd/virtual-keyboard.cpp
index 678c751410..ce19e9d462 100644
--- a/backends/vkeybd/virtual-keyboard.cpp
+++ b/backends/vkeybd/virtual-keyboard.cpp
@@ -98,7 +98,7 @@ bool VirtualKeyboard::openPack(const String &packName, const FSNode &node) {
 				return false;
 			}
 		} else {
-			warning("Could not find %s.xml file in %s.zip keyboard pack", packName.c_str(), packName.c_str());
+			warning("Could not find %s.xml file in %s.zip virtual keyboard pack", packName.c_str(), packName.c_str());
 			delete _fileArchive;
 			_fileArchive = 0;
 			return false;
@@ -132,15 +132,15 @@ bool VirtualKeyboard::loadKeyboardPack(const String &packName) {
 		_loaded = _parser->parse();
 
 		if (_loaded) {
-			debug("Keyboard pack '%s' loaded successfully", packName.c_str());
+			debug("Virtual keyboard pack '%s' loaded successfully", packName.c_str());
 		} else {
-			warning("Error parsing the keyboard pack '%s'", packName.c_str());
+			warning("Error parsing the virtual keyboard pack '%s'", packName.c_str());
 
 			delete _fileArchive;
 			_fileArchive = 0;
 		}
 	} else {
-		warning("Keyboard pack not found");
+		warning("Virtual keyboard disabled due to missing pack file");
 	}
 
 	return _loaded;
@@ -205,7 +205,7 @@ void VirtualKeyboard::switchMode(Mode *newMode) {
 
 void VirtualKeyboard::switchMode(const String &newMode) {
 	if (!_modes.contains(newMode)) {
-		warning("Keyboard mode '%s' unknown", newMode.c_str());
+		warning("Virtual keyboard mode '%s' unknown", newMode.c_str());
 	} else {
 		switchMode(&_modes[newMode]);
 	}
@@ -227,7 +227,7 @@ void VirtualKeyboard::handleMouseUp(int16 x, int16 y) {
 
 void VirtualKeyboard::show() {
 	if (!_loaded) {
-		warning("Virtual keyboard not loaded");
+		debug(1, "VirtualKeyboard::show() - Virtual keyboard not loaded");
 		return;
 	} else {
 		_kbdGUI->checkScreenChanged();
author	Marisa-Chan	2014-11-12 16:38:28 +0600
committer	Marisa-Chan	2014-11-12 16:38:28 +0600
commit	e6f66877627ff4ef03ad8d1ea8a64c4278593d22 (patch)
tree	b3f3815c2b43e711108ea74750487738053fa7b7 /backends
parent	f43326a533faec014fb1987f9ba3729127c46487 (diff)
parent	54a4b2fa863b5fd9469e360ecd7c4b0717b373fe (diff)
download	scummvm-rg350-e6f66877627ff4ef03ad8d1ea8a64c4278593d22.tar.gz scummvm-rg350-e6f66877627ff4ef03ad8d1ea8a64c4278593d22.tar.bz2 scummvm-rg350-e6f66877627ff4ef03ad8d1ea8a64c4278593d22.zip