(Apple) Cleanup header includes

apple/OSX/platform.m

@@ -19,7 +19,6 @@
 #import "../common/RetroArch_Apple.h"
 #include "../../input/drivers/cocoa_input.h"
 #include "../../frontend/frontend.h"
-#include "../../menu/menu.h"
 #include "../../retroarch.h"
 
 #include <objc/objc-runtime.h>

apple/common/RetroArch_Apple.h

@@ -70,6 +70,7 @@ void CFTemporaryDirectory(char *buf, size_t sizeof_buf);
 
 #include "../../core_info.h"
 #include "../../settings.h"
+#include "../../menu/menu.h"
 
 @protocol RetroArch_Platform
 - (void)loadingCore:(NSString*)core withFile:(const char*)file;
@@ -81,7 +82,31 @@ void CFTemporaryDirectory(char *buf, size_t sizeof_buf);
 
 #include <CoreLocation/CoreLocation.h>
 #import <AVFoundation/AVCaptureOutput.h>
-#include "../iOS/views.h"
+#include "../iOS/menu.h"
+
+@interface RADirectoryItem : NSObject<RAMenuItemBase>
+@property (nonatomic) NSString* path;
+@property (nonatomic) bool isDirectory;
+@end
+
+@interface RADirectoryList : RAMenuBase<UIActionSheetDelegate>
+@property (nonatomic, weak) RADirectoryItem* selectedItem;
+
+@property (nonatomic, copy) void (^chooseAction)(RADirectoryList* list, RADirectoryItem* item);
+@property (nonatomic, copy) NSString* path;
+@property (nonatomic, copy) NSString* extensions;
+
+@property (nonatomic) bool allowBlank;
+@property (nonatomic) bool forDirectory;
+
+- (id)initWithPath:(NSString*)path extensions:(const char*)extensions action:(void (^)(RADirectoryList* list, RADirectoryItem* item))action;
+- (void)browseTo:(NSString*)path;
+@end
+
+// browser.m
+@interface RAFoldersList : RAMenuBase
+- (id) initWithFilePath:(NSString*)path;
+@end
 
 typedef struct
 {

apple/iOS/menu.m

@@ -20,11 +20,9 @@
 #include "../../input/drivers/cocoa_input.h"
 #include <file/file_path.h>
 #include <retro_miscellaneous.h>
-#include "menu.h"
 
 #include <objc/runtime.h>
 
-#include "../../menu/menu.h"
 #include "../../menu/menu_entries.h"
 #include "../../menu/drivers/shared.h"
 

apple/iOS/platform.m

@@ -22,8 +22,6 @@
 #ifdef HAVE_MFI
 #include "../../input/drivers_hid/mfi_hid.h"
 #endif
-#include "menu.h"
-#include "../../menu/menu.h"
 
 #include "../../input/drivers_hid/btstack_hid.h"
 

apple/iOS/views.h

@@ -1,51 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2013-2014 - Jason Fetters
- *  Copyright (C) 2011-2015 - 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-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch 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 RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _RARCH_APPLE_VIEWS_H
-#define _RARCH_APPLE_VIEWS_H
-
-#include <UIKit/UIKit.h>
-#include "../../core_info.h"
-
-
-#include "menu.h"
-
-// browser.m
-@interface RADirectoryItem : NSObject<RAMenuItemBase>
-@property (nonatomic) NSString* path;
-@property (nonatomic) bool isDirectory;
-@end
-
-@interface RADirectoryList : RAMenuBase<UIActionSheetDelegate>
-@property (nonatomic, weak) RADirectoryItem* selectedItem;
-
-@property (nonatomic, copy) void (^chooseAction)(RADirectoryList* list, RADirectoryItem* item);
-@property (nonatomic, copy) NSString* path;
-@property (nonatomic, copy) NSString* extensions;
-
-@property (nonatomic) bool allowBlank;
-@property (nonatomic) bool forDirectory;
-
-- (id)initWithPath:(NSString*)path extensions:(const char*)extensions action:(void (^)(RADirectoryList* list, RADirectoryItem* item))action;
-- (void)browseTo:(NSString*)path;
-@end
-
-// browser.m
-@interface RAFoldersList : RAMenuBase
-- (id) initWithFilePath:(NSString*)path;
-@end
-
-#endif