diff --git a/ios/RetroArch/RetroArch-Prefix.pch b/compat/apple_compat.h
similarity index 94%
rename from ios/RetroArch/RetroArch-Prefix.pch
rename to compat/apple_compat.h
index fedf841223..5c4340608d 100644
--- a/ios/RetroArch/RetroArch-Prefix.pch
+++ b/compat/apple_compat.h
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2013 - Jason Fetters
+ *  Copyright (C) 2011-2013 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
@@ -13,10 +14,9 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-//
 // Prefix header for all source files of the 'RetroArch' target in the 'RetroArch' project
-//
 
+#ifdef IOS
 #import <Availability.h>
 
 #ifndef __IPHONE_5_0
@@ -30,3 +30,4 @@
 
     #import <objc/runtime.h>
 #endif
+#endif
diff --git a/ios/RetroArch.xcodeproj/project.pbxproj b/ios/RetroArch.xcodeproj/project.pbxproj
index 999f7c7954..df87a566df 100644
--- a/ios/RetroArch.xcodeproj/project.pbxproj
+++ b/ios/RetroArch.xcodeproj/project.pbxproj
@@ -440,8 +440,8 @@
 			buildSettings = {
 				CLANG_CXX_LIBRARY = "libstdc++";
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "RetroArch/RetroArch-Prefix.pch";
+				GCC_PRECOMPILE_PREFIX_HEADER = NO;
+				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = "RetroArch/RetroArch-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				LD_NO_PIE = YES;
@@ -487,8 +487,8 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "RetroArch/RetroArch-Prefix.pch";
+				GCC_PRECOMPILE_PREFIX_HEADER = NO;
+				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = "RetroArch/RetroArch-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				LD_NO_PIE = YES;
diff --git a/ios/RetroArch/RAModuleInfo.h b/ios/RetroArch/RAModuleInfo.h
index abd83a2e3d..df1bf2d124 100644
--- a/ios/RetroArch/RAModuleInfo.h
+++ b/ios/RetroArch/RAModuleInfo.h
@@ -13,6 +13,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _RA_MODULE_INFO_H
+#define _RA_MODULE_INFO_H
+
+#include "compat/apple_compat.h"
+
 #include "conf/config_file.h"
 #include "core_info.h"
 
@@ -34,3 +39,5 @@
 - (NSString*)configPath;
 @end
 
+#endif
+
diff --git a/ios/RetroArch/RetroArch_iOS.h b/ios/RetroArch/RetroArch_iOS.h
index 1fccfe18e6..9a8754d2fa 100644
--- a/ios/RetroArch/RetroArch_iOS.h
+++ b/ios/RetroArch/RetroArch_iOS.h
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2013 - Jason Fetters
+ *  Copyright (C) 2011-2013 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
@@ -13,6 +14,9 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __RARCH_APPLE_H
+#define __RARCH_APPLE_H
+
 #import "RAModuleInfo.h"
 
 @interface RetroArch_iOS : UINavigationController<UIApplicationDelegate, UINavigationControllerDelegate>
@@ -34,3 +38,5 @@ extern void ios_display_alert(NSString* message, NSString* title);
 extern void ios_clear_config_hack();
 extern bool path_make_and_check_directory(const char* path, mode_t mode, int amode);
 extern NSString* ios_get_value_from_config(config_file_t* config, NSString* name, NSString* defaultValue);
+
+#endif
diff --git a/ios/RetroArch/rarch_wrapper.h b/ios/RetroArch/rarch_wrapper.h
index be061a16ef..b4bf3e020f 100644
--- a/ios/RetroArch/rarch_wrapper.h
+++ b/ios/RetroArch/rarch_wrapper.h
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2013 - Jason Fetters
+ *  Copyright (C) 2011-2013 - Daniel De Matteis
  * 
  *  RetroArch 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 Found-
@@ -13,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __IOS_RARCH_WRAPPER_H__
-#define __IOS_RARCH_WRAPPER_H__
+#ifndef __APPLE_RARCH_WRAPPER_H__
+#define __APPLE_RARCH_WRAPPER_H__
 
 // The result needs to be free()'d
 char* ios_get_rarch_system_directory();
diff --git a/ios/RetroArch/views.h b/ios/RetroArch/views.h
index 584b28855a..58efb1aea6 100644
--- a/ios/RetroArch/views.h
+++ b/ios/RetroArch/views.h
@@ -13,6 +13,9 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _RARCH_APPLE_VIEWS_H
+#define _RARCH_APPLE_VIEWS_H
+
 #import "RAModuleInfo.h"
 
 // RAGameView.m
@@ -72,3 +75,5 @@
 // settings.m
 @interface RASystemSettingsList : RASettingsSubList<UIAlertViewDelegate>
 @end
+
+#endif