IOS: Renames iOS7 classes to avoid confusion

16 files changed, 294 insertions, 179 deletions

diff --git a/backends/platform/ios7/iOS7MainApplication.h b/backends/platform/ios7/iOS7MainApplication.h
new file mode 100644
index 0000000000..a47f5da9ce
--- /dev/null
+++ b/backends/platform/ios7/iOS7MainApplication.h
@@ -0,0 +1,39 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * 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.
+ *
+ */
+
+
+#import <UIKit/UIKit.h>
+
+@class iOS7ScummVMViewController;
+@class iPhoneView;
+
+@interface iOS7MainApplication : UIApplication {
+	UIWindow *_window;
+	iOS7ScummVMViewController *_controller;
+	iPhoneView *_view;
+}
+
+- (void)mainLoop:(id)param;
+- (iPhoneView *)getView;
+- (UIWindow *)getWindow;
+- (void)didRotate:(NSNotification *)notification;
+@end
diff --git a/backends/platform/ios7/iphone_main.mm b/backends/platform/ios7/iOS7MainApplication.mm
index 02d46c1995..c21c017174 100644
--- a/backends/platform/ios7/iphone_main.mm
+++ b/backends/platform/ios7/iOS7MainApplication.mm
@@ -20,59 +20,18 @@
  *
  */
 
-// Disable symbol overrides so that we can use system headers.
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
-
-#include <UIKit/UIKit.h>
-#include <Foundation/NSThread.h>
-
-#include "iphone_video.h"
-
-void iphone_main(int argc, char *argv[]);
-
-@interface ScummVMViewController : UIViewController
-
-@end
-
-@implementation ScummVMViewController
-
-- (BOOL)prefersStatusBarHidden {
-    return YES;
-}
 
-@end
+#import "iOS7MainApplication.h"
+#import "iOS7ScummVMViewController.h"
 
-@interface iPhoneMain : UIApplication {
-	UIWindow *_window;
-	ScummVMViewController *_controller;
-	iPhoneView *_view;
-}
-
-- (void)mainLoop:(id)param;
-- (iPhoneView *)getView;
-- (UIWindow *)getWindow;
-- (void)didRotate:(NSNotification *)notification;
-@end
-
-static int g_argc;
-static char **g_argv;
-
-int main(int argc, char **argv) {
-	g_argc = argc;
-	g_argv = argv;
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+#import "ios7_common.h"
+#import "ios7_video.h"
 
-	NSAutoreleasePool *autoreleasePool = [
-		[NSAutoreleasePool alloc] init
-	];
 
-	int returnCode = UIApplicationMain(argc, argv, @"iPhoneMain", @"iPhoneMain");
-	[autoreleasePool release];
-	return returnCode;
-}
+@implementation iOS7MainApplication
 
-@implementation iPhoneMain
-
--(id) init {
+-(id)init {
 	[super init];
 	_window = nil;
 	_view = nil;
@@ -80,9 +39,10 @@ int main(int argc, char **argv) {
 }
 
 - (void)mainLoop:(id)param {
-	[[NSAutoreleasePool alloc] init];
+	@autoreleasepool {
+		iOS7_main(iOS7_argc, iOS7_argv);
+	}
 
-	iphone_main(g_argc, g_argv);
 	exit(0);
 }
 
@@ -96,7 +56,7 @@ int main(int argc, char **argv) {
 	// Create the directory for savegames
 #ifdef IPHONE_OFFICIAL
 	NSFileManager *fm = [NSFileManager defaultManager];
-	NSString *documentPath = [NSString stringWithUTF8String:iPhone_getDocumentsDir()];
+	NSString *documentPath = [NSString stringWithUTF8String:iOS7_getDocumentsDir()];
 	NSString *savePath = [documentPath stringByAppendingPathComponent:@"Savegames"];
 	if (![fm fileExistsAtPath:savePath]) {
 		[fm createDirectoryAtPath:savePath withIntermediateDirectories:YES attributes:nil error:nil];
@@ -106,7 +66,7 @@ int main(int argc, char **argv) {
 	_window = [[UIWindow alloc] initWithFrame:rect];
 	[_window retain];
 
-	_controller = [[ScummVMViewController alloc] init];
+	_controller = [[iOS7ScummVMViewController alloc] init];
 
 	_view = [[iPhoneView alloc] initWithFrame:rect];
 	_view.multipleTouchEnabled = YES;
@@ -152,3 +112,10 @@ int main(int argc, char **argv) {
 }
 
 @end
+
+
+const char *iOS7_getDocumentsDir() {
+	NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+	NSString *documentsDirectory = [paths objectAtIndex:0];
+	return [documentsDirectory UTF8String];
+}
diff --git a/backends/platform/ios7/iOS7ScummVMViewController.h b/backends/platform/ios7/iOS7ScummVMViewController.h
new file mode 100644
index 0000000000..0322bc6f7f
--- /dev/null
+++ b/backends/platform/ios7/iOS7ScummVMViewController.h
@@ -0,0 +1,28 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * 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.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+
+
+@interface iOS7ScummVMViewController : UIViewController
+
+@end
diff --git a/backends/platform/ios7/iOS7ScummVMViewController.mm b/backends/platform/ios7/iOS7ScummVMViewController.mm
new file mode 100644
index 0000000000..f92fd0115c
--- /dev/null
+++ b/backends/platform/ios7/iOS7ScummVMViewController.mm
@@ -0,0 +1,32 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * 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.
+ *
+ */
+
+#import "iOS7ScummVMViewController.h"
+
+
+@implementation iOS7ScummVMViewController
+
+- (BOOL)prefersStatusBarHidden {
+    return YES;
+}
+
+@end
diff --git a/backends/platform/ios7/iphone_common.h b/backends/platform/ios7/ios7_common.h
index 94836dabcd..abc1180143 100644
--- a/backends/platform/ios7/iphone_common.h
+++ b/backends/platform/ios7/ios7_common.h
@@ -101,10 +101,16 @@ struct InternalEvent {
 };
 
 // On the ObjC side
-void iPhone_updateScreen();
-bool iPhone_fetchEvent(InternalEvent *event);
-const char *iPhone_getDocumentsDir();
-bool iPhone_isHighResDevice();
+
+extern int iOS7_argc;
+extern char **iOS7_argv;
+
+void iOS7_updateScreen();
+bool iOS7_fetchEvent(InternalEvent *event);
+bool iOS7_isHighResDevice();
+
+void iOS7_main(int argc, char **argv);
+const char *iOS7_getDocumentsDir();
 
 uint getSizeNextPOT(uint size);
 
diff --git a/backends/platform/ios7/iphone_keyboard.h b/backends/platform/ios7/ios7_keyboard.h
index ddd8f436e5..ddd8f436e5 100644
--- a/backends/platform/ios7/iphone_keyboard.h
+++ b/backends/platform/ios7/ios7_keyboard.h
diff --git a/backends/platform/ios7/iphone_keyboard.mm b/backends/platform/ios7/ios7_keyboard.mm
index 0588aac8ab..7923a1cda9 100644
--- a/backends/platform/ios7/iphone_keyboard.mm
+++ b/backends/platform/ios7/ios7_keyboard.mm
@@ -20,7 +20,7 @@
  *
  */
 
-#include "iphone_keyboard.h"
+#include "ios7_keyboard.h"
 
 @interface UITextInputTraits
 - (void)setAutocorrectionType:(int)type;
diff --git a/backends/platform/ios7/ios7_main.mm b/backends/platform/ios7/ios7_main.mm
new file mode 100644
index 0000000000..c6ca14d490
--- /dev/null
+++ b/backends/platform/ios7/ios7_main.mm
@@ -0,0 +1,47 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * 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.
+ *
+ */
+
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
+#include <UIKit/UIKit.h>
+#include <Foundation/NSThread.h>
+
+#include "ios7_video.h"
+
+
+int iOS7_argc;
+char **iOS7_argv;
+
+int main(int argc, char **argv) {
+	int returnCode;
+
+	@autoreleasepool {
+		iOS7_argc = argc;
+		iOS7_argv = argv;
+
+		returnCode = UIApplicationMain(argc, argv, @"iOS7MainApplication", @"iOS7MainApplication");
+	}
+
+	return returnCode;
+}
+
diff --git a/backends/platform/ios7/osys_events.cpp b/backends/platform/ios7/ios7_osys_events.cpp
index 19da580c80..da44983b03 100644
--- a/backends/platform/ios7/osys_events.cpp
+++ b/backends/platform/ios7/ios7_osys_events.cpp
@@ -26,11 +26,11 @@
 #include "gui/message.h"
 #include "common/translation.h"
 
-#include "osys_main.h"
+#include "ios7_osys_main.h"
 
 static const int kQueuedInputEventDelay = 50;
 
-bool OSystem_IPHONE::pollEvent(Common::Event &event) {
+bool OSystem_iOS7::pollEvent(Common::Event &event) {
 	//printf("pollEvent()\n");
 
 	long curTime = getMillis();
@@ -48,7 +48,7 @@ bool OSystem_IPHONE::pollEvent(Common::Event &event) {
 
 	InternalEvent internalEvent;
 
-	if (iPhone_fetchEvent(&internalEvent)) {
+	if (iOS7_fetchEvent(&internalEvent)) {
 		switch (internalEvent.type) {
 		case kInputMouseDown:
 			if (!handleEvent_mouseDown(event, internalEvent.value1, internalEvent.value2))
@@ -113,7 +113,7 @@ bool OSystem_IPHONE::pollEvent(Common::Event &event) {
 	return false;
 }
 
-bool OSystem_IPHONE::handleEvent_mouseDown(Common::Event &event, int x, int y) {
+bool OSystem_iOS7::handleEvent_mouseDown(Common::Event &event, int x, int y) {
 	//printf("Mouse down at (%u, %u)\n", x, y);
 
 	// Workaround: kInputMouseSecondToggled isn't always sent when the
@@ -137,7 +137,7 @@ bool OSystem_IPHONE::handleEvent_mouseDown(Common::Event &event, int x, int y) {
 	return false;
 }
 
-bool OSystem_IPHONE::handleEvent_mouseUp(Common::Event &event, int x, int y) {
+bool OSystem_iOS7::handleEvent_mouseUp(Common::Event &event, int x, int y) {
 	//printf("Mouse up at (%u, %u)\n", x, y);
 
 	if (_secondaryTapped) {
@@ -166,7 +166,7 @@ bool OSystem_IPHONE::handleEvent_mouseUp(Common::Event &event, int x, int y) {
 	return true;
 }
 
-bool OSystem_IPHONE::handleEvent_secondMouseDown(Common::Event &event, int x, int y) {
+bool OSystem_iOS7::handleEvent_secondMouseDown(Common::Event &event, int x, int y) {
 	_lastSecondaryDown = getMillis();
 	_gestureStartX = x;
 	_gestureStartY = y;
@@ -185,7 +185,7 @@ bool OSystem_IPHONE::handleEvent_secondMouseDown(Common::Event &event, int x, in
 	return true;
 }
 
-bool OSystem_IPHONE::handleEvent_secondMouseUp(Common::Event &event, int x, int y) {
+bool OSystem_iOS7::handleEvent_secondMouseUp(Common::Event &event, int x, int y) {
 	int curTime = getMillis();
 
 	if (curTime - _lastSecondaryDown < 400) {
@@ -224,7 +224,7 @@ bool OSystem_IPHONE::handleEvent_secondMouseUp(Common::Event &event, int x, int
 	return true;
 }
 
-bool OSystem_IPHONE::handleEvent_mouseDragged(Common::Event &event, int x, int y) {
+bool OSystem_iOS7::handleEvent_mouseDragged(Common::Event &event, int x, int y) {
 	if (_lastDragPosX == x && _lastDragPosY == y)
 		return false;
 
@@ -269,7 +269,7 @@ bool OSystem_IPHONE::handleEvent_mouseDragged(Common::Event &event, int x, int y
 	return true;
 }
 
-bool OSystem_IPHONE::handleEvent_mouseSecondDragged(Common::Event &event, int x, int y) {
+bool OSystem_iOS7::handleEvent_mouseSecondDragged(Common::Event &event, int x, int y) {
 	if (_gestureStartX == -1 || _gestureStartY == -1) {
 		return false;
 	}
@@ -335,7 +335,7 @@ bool OSystem_IPHONE::handleEvent_mouseSecondDragged(Common::Event &event, int x,
 	return false;
 }
 
-void  OSystem_IPHONE::handleEvent_orientationChanged(int orientation) {
+void  OSystem_iOS7::handleEvent_orientationChanged(int orientation) {
 	//printf("Orientation: %i\n", orientation);
 
 	ScreenOrientation newOrientation;
@@ -365,7 +365,7 @@ void  OSystem_IPHONE::handleEvent_orientationChanged(int orientation) {
 	}
 }
 
-void  OSystem_IPHONE::handleEvent_keyPressed(Common::Event &event, int keyPressed) {
+void  OSystem_iOS7::handleEvent_keyPressed(Common::Event &event, int keyPressed) {
 	int ascii = keyPressed;
 	//printf("key: %i\n", keyPressed);
 
@@ -426,7 +426,7 @@ void  OSystem_IPHONE::handleEvent_keyPressed(Common::Event &event, int keyPresse
 	_queuedEventTime = getMillis() + kQueuedInputEventDelay;
 }
 
-bool OSystem_IPHONE::handleEvent_swipe(Common::Event &event, int direction, int touches) {
+bool OSystem_iOS7::handleEvent_swipe(Common::Event &event, int direction, int touches) {
 	if (touches == 1) {
 		Common::KeyCode keycode = Common::KEYCODE_INVALID;
 		switch (_screenOrientation) {
@@ -538,7 +538,7 @@ bool OSystem_IPHONE::handleEvent_swipe(Common::Event &event, int direction, int
 	return false;
 }
 
-bool OSystem_IPHONE::handleEvent_tap(Common::Event &event, UIViewTapDescription type, int touches) {
+bool OSystem_iOS7::handleEvent_tap(Common::Event &event, UIViewTapDescription type, int touches) {
 	if (touches == 1) {
 		if (type == kUIViewTapDouble) {
 			event.type = Common::EVENT_RBUTTONDOWN;
diff --git a/backends/platform/ios7/osys_main.cpp b/backends/platform/ios7/ios7_osys_main.cpp
index ef3499d597..84ddff26df 100644
--- a/backends/platform/ios7/osys_main.cpp
+++ b/backends/platform/ios7/ios7_osys_main.cpp
@@ -43,20 +43,20 @@
 #include "audio/mixer.h"
 #include "audio/mixer_intern.h"
 
-#include "osys_main.h"
+#include "ios7_osys_main.h"
 
 
-const OSystem::GraphicsMode OSystem_IPHONE::s_supportedGraphicsModes[] = {
+const OSystem::GraphicsMode OSystem_iOS7::s_supportedGraphicsModes[] = {
 	{ "linear", "Linear filtering", kGraphicsModeLinear },
 	{ "none", "No filtering", kGraphicsModeNone },
 	{ 0, 0, 0 }
 };
 
-AQCallbackStruct OSystem_IPHONE::s_AudioQueue;
-SoundProc OSystem_IPHONE::s_soundCallback = NULL;
-void *OSystem_IPHONE::s_soundParam = NULL;
+AQCallbackStruct OSystem_iOS7::s_AudioQueue;
+SoundProc OSystem_iOS7::s_soundCallback = NULL;
+void *OSystem_iOS7::s_soundParam = NULL;
 
-OSystem_IPHONE::OSystem_IPHONE() :
+OSystem_iOS7::OSystem_iOS7() :
 	_mixer(NULL), _lastMouseTap(0), _queuedEventTime(0),
 	_mouseNeedTextureUpdate(false), _secondaryTapped(false), _lastSecondaryTap(0),
 	_screenOrientation(kScreenOrientationFlippedLandscape), _mouseClickAndDragEnabled(false),
@@ -64,9 +64,9 @@ OSystem_IPHONE::OSystem_IPHONE() :
 	_mouseDirty(false), _timeSuspended(0), _lastDragPosX(-1), _lastDragPosY(-1), _screenChangeCount(0),
 	_mouseCursorPaletteEnabled(false), _gfxTransactionError(kTransactionSuccess) {
 	_queuedInputEvent.type = Common::EVENT_INVALID;
-	_touchpadModeEnabled = !iPhone_isHighResDevice();
+	_touchpadModeEnabled = !iOS7_isHighResDevice();
 #ifdef IPHONE_OFFICIAL
-	_fsFactory = new ChRootFilesystemFactory(iPhone_getDocumentsDir());
+	_fsFactory = new ChRootFilesystemFactory(iOS7_getDocumentsDir());
 #else
 	_fsFactory = new POSIXFilesystemFactory();
 #endif
@@ -77,7 +77,7 @@ OSystem_IPHONE::OSystem_IPHONE() :
 	memset(_mouseCursorPalette, 0, sizeof(_mouseCursorPalette));
 }
 
-OSystem_IPHONE::~OSystem_IPHONE() {
+OSystem_iOS7::~OSystem_iOS7() {
 	AudioQueueDispose(s_AudioQueue.queue, true);
 
 	delete _mixer;
@@ -89,17 +89,17 @@ OSystem_IPHONE::~OSystem_IPHONE() {
 	_mouseBuffer.free();
 }
 
-bool OSystem_IPHONE::touchpadModeEnabled() const {
+bool OSystem_iOS7::touchpadModeEnabled() const {
 	return _touchpadModeEnabled;
 }
 
-int OSystem_IPHONE::timerHandler(int t) {
+int OSystem_iOS7::timerHandler(int t) {
 	DefaultTimerManager *tm = (DefaultTimerManager *)g_system->getTimerManager();
 	tm->handler();
 	return t;
 }
 
-void OSystem_IPHONE::initBackend() {
+void OSystem_iOS7::initBackend() {
 #ifdef IPHONE_OFFICIAL
 	_savefileManager = new DefaultSaveFileManager("/Savegames");
 #else
@@ -112,12 +112,12 @@ void OSystem_IPHONE::initBackend() {
 
 	setupMixer();
 
-	setTimerCallback(&OSystem_IPHONE::timerHandler, 10);
+	setTimerCallback(&OSystem_iOS7::timerHandler, 10);
 
 	EventsBaseBackend::initBackend();
 }
 
-bool OSystem_IPHONE::hasFeature(Feature f) {
+bool OSystem_iOS7::hasFeature(Feature f) {
 	switch (f) {
 	case kFeatureCursorPalette:
 		return true;
@@ -127,7 +127,7 @@ bool OSystem_IPHONE::hasFeature(Feature f) {
 	}
 }
 
-void OSystem_IPHONE::setFeatureState(Feature f, bool enable) {
+void OSystem_iOS7::setFeatureState(Feature f, bool enable) {
 	switch (f) {
 	case kFeatureCursorPalette:
 		if (_mouseCursorPaletteEnabled != enable) {
@@ -145,7 +145,7 @@ void OSystem_IPHONE::setFeatureState(Feature f, bool enable) {
 	}
 }
 
-bool OSystem_IPHONE::getFeatureState(Feature f) {
+bool OSystem_iOS7::getFeatureState(Feature f) {
 	switch (f) {
 	case kFeatureCursorPalette:
 		return _mouseCursorPaletteEnabled;
@@ -157,7 +157,7 @@ bool OSystem_IPHONE::getFeatureState(Feature f) {
 	}
 }
 
-void OSystem_IPHONE::suspendLoop() {
+void OSystem_iOS7::suspendLoop() {
 	bool done = false;
 	uint32 startTime = getMillis();
 
@@ -165,7 +165,7 @@ void OSystem_IPHONE::suspendLoop() {
 
 	InternalEvent event;
 	while (!done) {
-		if (iPhone_fetchEvent(&event))
+		if (iOS7_fetchEvent(&event))
 			if (event.type == kInputApplicationResumed)
 				done = true;
 		usleep(100000);
@@ -176,7 +176,7 @@ void OSystem_IPHONE::suspendLoop() {
 	_timeSuspended += getMillis() - startTime;
 }
 
-uint32 OSystem_IPHONE::getMillis(bool skipRecord) {
+uint32 OSystem_iOS7::getMillis(bool skipRecord) {
 	//printf("getMillis()\n");
 
 	struct timeval currentTime;
@@ -185,12 +185,12 @@ uint32 OSystem_IPHONE::getMillis(bool skipRecord) {
 	                ((currentTime.tv_usec - _startTime.tv_usec) / 1000)) - _timeSuspended;
 }
 
-void OSystem_IPHONE::delayMillis(uint msecs) {
+void OSystem_iOS7::delayMillis(uint msecs) {
 	//printf("delayMillis(%d)\n", msecs);
 	usleep(msecs * 1000);
 }
 
-OSystem::MutexRef OSystem_IPHONE::createMutex(void) {
+OSystem::MutexRef OSystem_iOS7::createMutex(void) {
 	pthread_mutexattr_t attr;
 	pthread_mutexattr_init(&attr);
 	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
@@ -205,19 +205,19 @@ OSystem::MutexRef OSystem_IPHONE::createMutex(void) {
 	return (MutexRef)mutex;
 }
 
-void OSystem_IPHONE::lockMutex(MutexRef mutex) {
+void OSystem_iOS7::lockMutex(MutexRef mutex) {
 	if (pthread_mutex_lock((pthread_mutex_t *) mutex) != 0) {
 		printf("pthread_mutex_lock() failed!\n");
 	}
 }
 
-void OSystem_IPHONE::unlockMutex(MutexRef mutex) {
+void OSystem_iOS7::unlockMutex(MutexRef mutex) {
 	if (pthread_mutex_unlock((pthread_mutex_t *) mutex) != 0) {
 		printf("pthread_mutex_unlock() failed!\n");
 	}
 }
 
-void OSystem_IPHONE::deleteMutex(MutexRef mutex) {
+void OSystem_iOS7::deleteMutex(MutexRef mutex) {
 	if (pthread_mutex_destroy((pthread_mutex_t *) mutex) != 0) {
 		printf("pthread_mutex_destroy() failed!\n");
 	} else {
@@ -226,7 +226,7 @@ void OSystem_IPHONE::deleteMutex(MutexRef mutex) {
 }
 
 
-void OSystem_IPHONE::setTimerCallback(TimerProc callback, int interval) {
+void OSystem_iOS7::setTimerCallback(TimerProc callback, int interval) {
 	//printf("setTimerCallback()\n");
 
 	if (callback != NULL) {
@@ -237,10 +237,10 @@ void OSystem_IPHONE::setTimerCallback(TimerProc callback, int interval) {
 		_timerCallback = NULL;
 }
 
-void OSystem_IPHONE::quit() {
+void OSystem_iOS7::quit() {
 }
 
-void OSystem_IPHONE::getTimeAndDate(TimeDate &td) const {
+void OSystem_iOS7::getTimeAndDate(TimeDate &td) const {
 	time_t curTime = time(0);
 	struct tm t = *localtime(&curTime);
 	td.tm_sec = t.tm_sec;
@@ -252,16 +252,16 @@ void OSystem_IPHONE::getTimeAndDate(TimeDate &td) const {
 	td.tm_wday = t.tm_wday;
 }
 
-Audio::Mixer *OSystem_IPHONE::getMixer() {
+Audio::Mixer *OSystem_iOS7::getMixer() {
 	assert(_mixer);
 	return _mixer;
 }
 
-OSystem *OSystem_IPHONE_create() {
-	return new OSystem_IPHONE();
+OSystem *OSystem_iOS7_create() {
+	return new OSystem_iOS7();
 }
 
-Common::String OSystem_IPHONE::getDefaultConfigFileName() {
+Common::String OSystem_iOS7::getDefaultConfigFileName() {
 #ifdef IPHONE_OFFICIAL
 	Common::String path = "/Preferences";
 	return path;
@@ -270,7 +270,7 @@ Common::String OSystem_IPHONE::getDefaultConfigFileName() {
 #endif
 }
 
-void OSystem_IPHONE::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
+void OSystem_iOS7::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
 	// Get URL of the Resource directory of the .app bundle
 	CFURLRef fileUrl = CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle());
 	if (fileUrl) {
@@ -292,7 +292,7 @@ void OSystem_IPHONE::addSysArchivesToSearchSet(Common::SearchSet &s, int priorit
 	}
 }
 
-void OSystem_IPHONE::logMessage(LogMessageType::Type type, const char *message) {
+void OSystem_iOS7::logMessage(LogMessageType::Type type, const char *message) {
 	FILE *output = 0;
 
 	if (type == LogMessageType::kInfo || type == LogMessageType::kDebug)
@@ -304,14 +304,14 @@ void OSystem_IPHONE::logMessage(LogMessageType::Type type, const char *message)
 	fflush(output);
 }
 
-bool iphone_touchpadModeEnabled() {
-	OSystem_IPHONE *sys = (OSystem_IPHONE *) g_system;
+bool iOS7_touchpadModeEnabled() {
+	OSystem_iOS7 *sys = (OSystem_iOS7 *) g_system;
 	return sys && sys->touchpadModeEnabled();
 }
 
-void iphone_main(int argc, char *argv[]) {
+void iOS7_main(int argc, char **argv) {
 
-	//OSystem_IPHONE::migrateApp();
+	//OSystem_iOS7::migrateApp();
 
 	FILE *newfp = fopen("/var/mobile/.scummvm.log", "a");
 	if (newfp != NULL) {
@@ -327,7 +327,7 @@ void iphone_main(int argc, char *argv[]) {
 	}
 
 #ifdef IPHONE_OFFICIAL
-	chdir(iPhone_getDocumentsDir());
+	chdir(iOS7_getDocumentsDir());
 #else
 	system("mkdir " SCUMMVM_ROOT_PATH);
 	system("mkdir " SCUMMVM_SAVE_PATH);
@@ -335,7 +335,7 @@ void iphone_main(int argc, char *argv[]) {
 	chdir("/var/mobile/");
 #endif
 
-	g_system = OSystem_IPHONE_create();
+	g_system = OSystem_iOS7_create();
 	assert(g_system);
 
 	// Invoke the actual ScummVM main entry point:
diff --git a/backends/platform/ios7/osys_main.h b/backends/platform/ios7/ios7_osys_main.h
index 04a531613f..50114a9112 100644
--- a/backends/platform/ios7/osys_main.h
+++ b/backends/platform/ios7/ios7_osys_main.h
@@ -24,7 +24,7 @@
 #define BACKENDS_PLATFORM_IPHONE_OSYS_MAIN_H
 
 #include "graphics/surface.h"
-#include "iphone_common.h"
+#include "ios7_common.h"
 #include "backends/base-backend.h"
 #include "common/events.h"
 #include "audio/mixer_intern.h"
@@ -52,7 +52,7 @@ struct AQCallbackStruct {
 	AudioStreamBasicDescription dataFormat;
 };
 
-class OSystem_IPHONE : public EventsBaseBackend, public PaletteManager {
+class OSystem_iOS7 : public EventsBaseBackend, public PaletteManager {
 protected:
 	static const OSystem::GraphicsMode s_supportedGraphicsModes[];
 	static AQCallbackStruct s_AudioQueue;
@@ -111,8 +111,8 @@ protected:
 
 public:
 
-	OSystem_IPHONE();
-	virtual ~OSystem_IPHONE();
+	OSystem_iOS7();
+	virtual ~OSystem_iOS7();
 
 	virtual void initBackend();
 
diff --git a/backends/platform/ios7/osys_sound.cpp b/backends/platform/ios7/ios7_osys_sound.cpp
index bfee06c6f2..0dc81a9385 100644
--- a/backends/platform/ios7/osys_sound.cpp
+++ b/backends/platform/ios7/ios7_osys_sound.cpp
@@ -23,9 +23,9 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 
-#include "osys_main.h"
+#include "ios7_osys_main.h"
 
-void OSystem_IPHONE::AQBufferCallback(void *in, AudioQueueRef inQ, AudioQueueBufferRef outQB) {
+void OSystem_iOS7::AQBufferCallback(void *in, AudioQueueRef inQ, AudioQueueBufferRef outQB) {
 	//printf("AQBufferCallback()\n");
 	if (s_AudioQueue.frameCount > 0 && s_soundCallback != NULL) {
 		outQB->mAudioDataByteSize = 4 * s_AudioQueue.frameCount;
@@ -36,8 +36,8 @@ void OSystem_IPHONE::AQBufferCallback(void *in, AudioQueueRef inQ, AudioQueueBuf
 	}
 }
 
-void OSystem_IPHONE::mixCallback(void *sys, byte *samples, int len) {
-	OSystem_IPHONE *this_ = (OSystem_IPHONE *)sys;
+void OSystem_iOS7::mixCallback(void *sys, byte *samples, int len) {
+	OSystem_iOS7 *this_ = (OSystem_iOS7 *)sys;
 	assert(this_);
 
 	if (this_->_mixer) {
@@ -45,7 +45,7 @@ void OSystem_IPHONE::mixCallback(void *sys, byte *samples, int len) {
 	}
 }
 
-void OSystem_IPHONE::setupMixer() {
+void OSystem_iOS7::setupMixer() {
 	_mixer = new Audio::MixerImpl(this, AUDIO_SAMPLE_RATE);
 
 	s_soundCallback = mixCallback;
@@ -54,7 +54,7 @@ void OSystem_IPHONE::setupMixer() {
 	startSoundsystem();
 }
 
-void OSystem_IPHONE::startSoundsystem() {
+void OSystem_iOS7::startSoundsystem() {
 	s_AudioQueue.dataFormat.mSampleRate = AUDIO_SAMPLE_RATE;
 	s_AudioQueue.dataFormat.mFormatID = kAudioFormatLinearPCM;
 	s_AudioQueue.dataFormat.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked;
@@ -93,7 +93,7 @@ void OSystem_IPHONE::startSoundsystem() {
 	_mixer->setReady(true);
 }
 
-void OSystem_IPHONE::stopSoundsystem() {
+void OSystem_iOS7::stopSoundsystem() {
 	AudioQueueStop(s_AudioQueue.queue, true);
 
 	for (int i = 0; i < AUDIO_BUFFERS; i++) {
diff --git a/backends/platform/ios7/osys_video.mm b/backends/platform/ios7/ios7_osys_video.mm
index c76f432dda..4835ef5638 100644
--- a/backends/platform/ios7/osys_video.mm
+++ b/backends/platform/ios7/ios7_osys_video.mm
@@ -23,24 +23,24 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 
-#include "osys_main.h"
-#include "iphone_video.h"
+#include "ios7_osys_main.h"
+#include "ios7_video.h"
 
 #include "graphics/conversion.h"
 
-void OSystem_IPHONE::initVideoContext() {
+void OSystem_iOS7::initVideoContext() {
 	_videoContext = [g_iPhoneViewInstance getVideoContext];
 }
 
-const OSystem::GraphicsMode *OSystem_IPHONE::getSupportedGraphicsModes() const {
+const OSystem::GraphicsMode *OSystem_iOS7::getSupportedGraphicsModes() const {
 	return s_supportedGraphicsModes;
 }
 
-int OSystem_IPHONE::getDefaultGraphicsMode() const {
+int OSystem_iOS7::getDefaultGraphicsMode() const {
 	return kGraphicsModeLinear;
 }
 
-bool OSystem_IPHONE::setGraphicsMode(int mode) {
+bool OSystem_iOS7::setGraphicsMode(int mode) {
 	switch (mode) {
 	case kGraphicsModeNone:
 	case kGraphicsModeLinear:
@@ -52,12 +52,12 @@ bool OSystem_IPHONE::setGraphicsMode(int mode) {
 	}
 }
 
-int OSystem_IPHONE::getGraphicsMode() const {
+int OSystem_iOS7::getGraphicsMode() const {
 	return _videoContext->graphicsMode;
 }
 
 #ifdef USE_RGB_COLOR
-Common::List<Graphics::PixelFormat> OSystem_IPHONE::getSupportedFormats() const {
+Common::List<Graphics::PixelFormat> OSystem_iOS7::getSupportedFormats() const {
 	Common::List<Graphics::PixelFormat> list;
 	// RGB565
 	list.push_back(Graphics::createPixelFormat<565>());
@@ -67,7 +67,7 @@ Common::List<Graphics::PixelFormat> OSystem_IPHONE::getSupportedFormats() const
 }
 #endif
 
-void OSystem_IPHONE::initSize(uint width, uint height, const Graphics::PixelFormat *format) {
+void OSystem_iOS7::initSize(uint width, uint height, const Graphics::PixelFormat *format) {
 	//printf("initSize(%u, %u, %p)\n", width, height, (const void *)format);
 
 	_videoContext->screenWidth = width;
@@ -112,11 +112,11 @@ void OSystem_IPHONE::initSize(uint width, uint height, const Graphics::PixelForm
 	_mouseCursorPaletteEnabled = false;
 }
 
-void OSystem_IPHONE::beginGFXTransaction() {
+void OSystem_iOS7::beginGFXTransaction() {
 	_gfxTransactionError = kTransactionSuccess;
 }
 
-OSystem::TransactionError OSystem_IPHONE::endGFXTransaction() {
+OSystem::TransactionError OSystem_iOS7::endGFXTransaction() {
 	_screenChangeCount++;
 	updateOutputSurface();
 	[g_iPhoneViewInstance performSelectorOnMainThread:@selector(setGraphicsMode) withObject:nil waitUntilDone: YES];
@@ -124,19 +124,19 @@ OSystem::TransactionError OSystem_IPHONE::endGFXTransaction() {
 	return _gfxTransactionError;
 }
 
-void OSystem_IPHONE::updateOutputSurface() {
+void OSystem_iOS7::updateOutputSurface() {
 	[g_iPhoneViewInstance performSelectorOnMainThread:@selector(initSurface) withObject:nil waitUntilDone: YES];
 }
 
-int16 OSystem_IPHONE::getHeight() {
+int16 OSystem_iOS7::getHeight() {
 	return _videoContext->screenHeight;
 }
 
-int16 OSystem_IPHONE::getWidth() {
+int16 OSystem_iOS7::getWidth() {
 	return _videoContext->screenWidth;
 }
 
-void OSystem_IPHONE::setPalette(const byte *colors, uint start, uint num) {
+void OSystem_iOS7::setPalette(const byte *colors, uint start, uint num) {
 	//printf("setPalette(%p, %u, %u)\n", colors, start, num);
 	assert(start + num <= 256);
 	const byte *b = colors;
@@ -155,7 +155,7 @@ void OSystem_IPHONE::setPalette(const byte *colors, uint start, uint num) {
 		_mouseDirty = _mouseNeedTextureUpdate = true;
 }
 
-void OSystem_IPHONE::grabPalette(byte *colors, uint start, uint num) {
+void OSystem_iOS7::grabPalette(byte *colors, uint start, uint num) {
 	//printf("grabPalette(%p, %u, %u)\n", colors, start, num);
 	assert(start + num <= 256);
 	byte *b = colors;
@@ -166,7 +166,7 @@ void OSystem_IPHONE::grabPalette(byte *colors, uint start, uint num) {
 	}
 }
 
-void OSystem_IPHONE::copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h) {
+void OSystem_iOS7::copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h) {
 	//printf("copyRectToScreen(%p, %d, %i, %i, %i, %i)\n", buf, pitch, x, y, w, h);
 	//Clip the coordinates
 	const byte *src = (const byte *)buf;
@@ -209,7 +209,7 @@ void OSystem_IPHONE::copyRectToScreen(const void *buf, int pitch, int x, int y,
 	}
 }
 
-void OSystem_IPHONE::updateScreen() {
+void OSystem_iOS7::updateScreen() {
 	if (_dirtyRects.size() == 0 && _dirtyOverlayRects.size() == 0 && !_mouseDirty)
 		return;
 
@@ -220,10 +220,10 @@ void OSystem_IPHONE::updateScreen() {
 	_fullScreenIsDirty = false;
 	_fullScreenOverlayIsDirty = false;
 
-	iPhone_updateScreen();
+	iOS7_updateScreen();
 }
 
-void OSystem_IPHONE::internUpdateScreen() {
+void OSystem_iOS7::internUpdateScreen() {
 	if (_mouseNeedTextureUpdate) {
 		updateMouseTexture();
 		_mouseNeedTextureUpdate = false;
@@ -250,7 +250,7 @@ void OSystem_IPHONE::internUpdateScreen() {
 	}
 }
 
-void OSystem_IPHONE::drawDirtyRect(const Common::Rect &dirtyRect) {
+void OSystem_iOS7::drawDirtyRect(const Common::Rect &dirtyRect) {
 	// We only need to do a color look up for CLUT8
 	if (_framebuffer.format.bytesPerPixel != 1)
 		return;
@@ -272,17 +272,17 @@ void OSystem_IPHONE::drawDirtyRect(const Common::Rect &dirtyRect) {
 	}
 }
 
-Graphics::Surface *OSystem_IPHONE::lockScreen() {
+Graphics::Surface *OSystem_iOS7::lockScreen() {
 	//printf("lockScreen()\n");
 	return &_framebuffer;
 }
 
-void OSystem_IPHONE::unlockScreen() {
+void OSystem_iOS7::unlockScreen() {
 	//printf("unlockScreen()\n");
 	dirtyFullScreen();
 }
 
-void OSystem_IPHONE::setShakePos(int shakeOffset) {
+void OSystem_iOS7::setShakePos(int shakeOffset) {
 	//printf("setShakePos(%i)\n", shakeOffset);
 	_videoContext->shakeOffsetY = shakeOffset;
 	[g_iPhoneViewInstance performSelectorOnMainThread:@selector(setViewTransformation) withObject:nil waitUntilDone: YES];
@@ -290,7 +290,7 @@ void OSystem_IPHONE::setShakePos(int shakeOffset) {
 	_mouseDirty = true;
 }
 
-void OSystem_IPHONE::showOverlay() {
+void OSystem_iOS7::showOverlay() {
 	//printf("showOverlay()\n");
 	_videoContext->overlayVisible = true;
 	dirtyFullOverlayScreen();
@@ -299,7 +299,7 @@ void OSystem_IPHONE::showOverlay() {
 	[g_iPhoneViewInstance performSelectorOnMainThread:@selector(clearColorBuffer) withObject:nil waitUntilDone: YES];
 }
 
-void OSystem_IPHONE::hideOverlay() {
+void OSystem_iOS7::hideOverlay() {
 	//printf("hideOverlay()\n");
 	_videoContext->overlayVisible = false;
 	_dirtyOverlayRects.clear();
@@ -308,13 +308,13 @@ void OSystem_IPHONE::hideOverlay() {
 	[g_iPhoneViewInstance performSelectorOnMainThread:@selector(clearColorBuffer) withObject:nil waitUntilDone: YES];
 }
 
-void OSystem_IPHONE::clearOverlay() {
+void OSystem_iOS7::clearOverlay() {
 	//printf("clearOverlay()\n");
 	bzero(_videoContext->overlayTexture.getPixels(), _videoContext->overlayTexture.h * _videoContext->overlayTexture.pitch);
 	dirtyFullOverlayScreen();
 }
 
-void OSystem_IPHONE::grabOverlay(void *buf, int pitch) {
+void OSystem_iOS7::grabOverlay(void *buf, int pitch) {
 	//printf("grabOverlay()\n");
 	int h = _videoContext->overlayHeight;
 
@@ -327,7 +327,7 @@ void OSystem_IPHONE::grabOverlay(void *buf, int pitch) {
 	} while (--h);
 }
 
-void OSystem_IPHONE::copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h) {
+void OSystem_iOS7::copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h) {
 	//printf("copyRectToOverlay(%p, pitch=%i, x=%i, y=%i, w=%i, h=%i)\n", (const void *)buf, pitch, x, y, w, h);
 	const byte *src = (const byte *)buf;
 
@@ -365,15 +365,15 @@ void OSystem_IPHONE::copyRectToOverlay(const void *buf, int pitch, int x, int y,
 	} while (--h);
 }
 
-int16 OSystem_IPHONE::getOverlayHeight() {
+int16 OSystem_iOS7::getOverlayHeight() {
 	return _videoContext->overlayHeight;
 }
 
-int16 OSystem_IPHONE::getOverlayWidth() {
+int16 OSystem_iOS7::getOverlayWidth() {
 	return _videoContext->overlayWidth;
 }
 
-bool OSystem_IPHONE::showMouse(bool visible) {
+bool OSystem_iOS7::showMouse(bool visible) {
 	//printf("showMouse(%d)\n", visible);
 	bool last = _videoContext->mouseIsVisible;
 	_videoContext->mouseIsVisible = visible;
@@ -382,7 +382,7 @@ bool OSystem_IPHONE::showMouse(bool visible) {
 	return last;
 }
 
-void OSystem_IPHONE::warpMouse(int x, int y) {
+void OSystem_iOS7::warpMouse(int x, int y) {
 	//printf("warpMouse(%d, %d)\n", x, y);
 	_videoContext->mouseX = x;
 	_videoContext->mouseY = y;
@@ -390,7 +390,7 @@ void OSystem_IPHONE::warpMouse(int x, int y) {
 	_mouseDirty = true;
 }
 
-void OSystem_IPHONE::dirtyFullScreen() {
+void OSystem_iOS7::dirtyFullScreen() {
 	if (!_fullScreenIsDirty) {
 		_dirtyRects.clear();
 		_dirtyRects.push_back(Common::Rect(0, 0, _videoContext->screenWidth, _videoContext->screenHeight));
@@ -398,7 +398,7 @@ void OSystem_IPHONE::dirtyFullScreen() {
 	}
 }
 
-void OSystem_IPHONE::dirtyFullOverlayScreen() {
+void OSystem_iOS7::dirtyFullOverlayScreen() {
 	if (!_fullScreenOverlayIsDirty) {
 		_dirtyOverlayRects.clear();
 		_dirtyOverlayRects.push_back(Common::Rect(0, 0, _videoContext->overlayWidth, _videoContext->overlayHeight));
@@ -406,7 +406,7 @@ void OSystem_IPHONE::dirtyFullOverlayScreen() {
 	}
 }
 
-void OSystem_IPHONE::setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale, const Graphics::PixelFormat *format) {
+void OSystem_iOS7::setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale, const Graphics::PixelFormat *format) {
 	//printf("setMouseCursor(%p, %u, %u, %i, %i, %u, %d, %p)\n", (const void *)buf, w, h, hotspotX, hotspotY, keycolor, dontScale, (const void *)format);
 
 	const Graphics::PixelFormat pixelFormat = format ? *format : Graphics::PixelFormat::createFormatCLUT8();
@@ -434,7 +434,7 @@ void OSystem_IPHONE::setMouseCursor(const void *buf, uint w, uint h, int hotspot
 	_mouseNeedTextureUpdate = true;
 }
 
-void OSystem_IPHONE::setCursorPalette(const byte *colors, uint start, uint num) {
+void OSystem_iOS7::setCursorPalette(const byte *colors, uint start, uint num) {
 	//printf("setCursorPalette(%p, %u, %u)\n", (const void *)colors, start, num);
 	assert(start + num <= 256);
 
@@ -449,7 +449,7 @@ void OSystem_IPHONE::setCursorPalette(const byte *colors, uint start, uint num)
 		_mouseDirty = _mouseNeedTextureUpdate = true;
 }
 
-void OSystem_IPHONE::updateMouseTexture() {
+void OSystem_iOS7::updateMouseTexture() {
 	uint texWidth = getSizeNextPOT(_videoContext->mouseWidth);
 	uint texHeight = getSizeNextPOT(_videoContext->mouseHeight);
 
diff --git a/backends/platform/ios7/iphone_video.h b/backends/platform/ios7/ios7_video.h
index 5c9766a116..63a570d19d 100644
--- a/backends/platform/ios7/iphone_video.h
+++ b/backends/platform/ios7/ios7_video.h
@@ -31,8 +31,8 @@
 #include <OpenGLES/ES1/gl.h>
 #include <OpenGLES/ES1/glext.h>
 
-#include "iphone_keyboard.h"
-#include "iphone_common.h"
+#include "ios7_keyboard.h"
+#include "ios7_common.h"
 
 #include "common/list.h"
 
diff --git a/backends/platform/ios7/iphone_video.mm b/backends/platform/ios7/ios7_video.mm
index 8470651794..8cd4751c59 100644
--- a/backends/platform/ios7/iphone_video.mm
+++ b/backends/platform/ios7/ios7_video.mm
@@ -23,7 +23,7 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 
-#include "iphone_video.h"
+#include "ios7_video.h"
 
 #include "graphics/colormasks.h"
 #include "common/system.h"
@@ -39,7 +39,7 @@ static long g_lastTick = 0;
 static int g_frames = 0;
 #endif
 
-extern bool iphone_touchpadModeEnabled();
+extern bool iOS7_touchpadModeEnabled();
 
 #define printOpenGLError() printOglError(__FILE__, __LINE__)
 
@@ -56,11 +56,11 @@ int printOglError(const char *file, int line) {
 	return retCode;
 }
 
-bool iPhone_isHighResDevice() {
+bool iOS7_isHighResDevice() {
 	return g_fullHeight > 480;
 }
 
-void iPhone_updateScreen() {
+void iOS7_updateScreen() {
 	//printf("Mouse: (%i, %i)\n", mouseX, mouseY);
 	if (!g_needsScreenUpdate) {
 		g_needsScreenUpdate = 1;
@@ -68,7 +68,7 @@ void iPhone_updateScreen() {
 	}
 }
 
-bool iPhone_fetchEvent(InternalEvent *event) {
+bool iOS7_fetchEvent(InternalEvent *event) {
 	return [g_iPhoneViewInstance fetchEvent:event];
 }
 
@@ -85,12 +85,6 @@ uint getSizeNextPOT(uint size) {
 	return size;
 }
 
-const char *iPhone_getDocumentsDir() {
-	NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-	NSString *documentsDirectory = [paths objectAtIndex:0];
-	return [documentsDirectory UTF8String];
-}
-
 @implementation iPhoneView
 
 + (Class)layerClass {
@@ -688,7 +682,7 @@ const char *iPhone_getDocumentsDir() {
 	// thus we need to add it here.
 	*y = (int)(point.y * height + offsetY);
 
-	if (!iphone_touchpadModeEnabled()) {
+	if (!iOS7_touchpadModeEnabled()) {
 		// Clip coordinates
 		if (*x < 0 || *x > width || *y < 0 || *y > height)
 			return false;
diff --git a/backends/platform/ios7/module.mk b/backends/platform/ios7/module.mk
index 87721cc9e5..fad69d715e 100644
--- a/backends/platform/ios7/module.mk
+++ b/backends/platform/ios7/module.mk
@@ -1,13 +1,15 @@
 MODULE := backends/platform/ios7
 
 MODULE_OBJS := \
-	osys_main.o \
-	osys_events.o \
-	osys_sound.o \
-	osys_video.o \
-	iphone_main.o \
-	iphone_video.o \
-	iphone_keyboard.o
+	ios7_osys_main.o \
+	ios7_osys_events.o \
+	ios7_osys_sound.o \
+	ios7_osys_video.o \
+	ios7_main.o \
+	ios7_video.o \
+	ios7_keyboard.o \
+	iOS7ScummVMViewController.o \
+	iOS7MainApplication.o
 
 # We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
 MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))