1.1 --- a/src/video/uikit/SDL_uikitappdelegate.h	Tue Sep 27 22:54:59 2011 +0200
     1.2 +++ b/src/video/uikit/SDL_uikitappdelegate.h	Tue Sep 27 23:40:21 2011 +0200
     1.3 @@ -20,7 +20,6 @@
     1.4  */
     1.5  
     1.6  #import <UIKit/UIKit.h>
     1.7 -#import "SDL_uikitopenglview.h"
     1.8  
     1.9  @interface SDLUIKitDelegate : NSObject<UIApplicationDelegate> {
    1.10  }

     2.1 --- a/src/video/uikit/SDL_uikitevents.h	Tue Sep 27 22:54:59 2011 +0200
     2.2 +++ b/src/video/uikit/SDL_uikitevents.h	Tue Sep 27 23:40:21 2011 +0200
     2.3 @@ -18,10 +18,13 @@
     2.4       misrepresented as being the original software.
     2.5    3. This notice may not be removed or altered from any source distribution.
     2.6  */
     2.7 -#include "SDL_config.h"
     2.8 +#ifndef _SDL_uikitevents_h
     2.9 +#define _SDL_uikitevents_h
    2.10  
    2.11 -#include "SDL_uikitvideo.h"
    2.12 +#include "../SDL_sysvideo.h"
    2.13  
    2.14  extern void UIKit_PumpEvents(_THIS);
    2.15  
    2.16 +#endif /* _SDL_uikitevents_h */
    2.17 +
    2.18  /* vi: set ts=4 sw=4 expandtab: */

     3.1 --- a/src/video/uikit/SDL_uikitopengles.h	Tue Sep 27 22:54:59 2011 +0200
     3.2 +++ b/src/video/uikit/SDL_uikitopengles.h	Tue Sep 27 23:40:21 2011 +0200
     3.3 @@ -18,13 +18,10 @@
     3.4       misrepresented as being the original software.
     3.5    3. This notice may not be removed or altered from any source distribution.
     3.6  */
     3.7 -
     3.8 -#include "SDL_config.h"
     3.9 -
    3.10  #ifndef _SDL_uikitopengles
    3.11  #define _SDL_uikitopengles
    3.12  
    3.13 -#include "SDL_uikitvideo.h"
    3.14 +#include "../SDL_sysvideo.h"
    3.15  
    3.16  extern int UIKit_GL_MakeCurrent(_THIS, SDL_Window * window,
    3.17                                  SDL_GLContext context);

     4.1 --- a/src/video/uikit/SDL_uikitvideo.h	Tue Sep 27 22:54:59 2011 +0200
     4.2 +++ b/src/video/uikit/SDL_uikitvideo.h	Tue Sep 27 23:40:21 2011 +0200
     4.3 @@ -18,13 +18,9 @@
     4.4       misrepresented as being the original software.
     4.5    3. This notice may not be removed or altered from any source distribution.
     4.6  */
     4.7 -#include "SDL_config.h"
     4.8 -
     4.9  #ifndef _SDL_uikitvideo_h
    4.10  #define _SDL_uikitvideo_h
    4.11  
    4.12 -#include "../SDL_sysvideo.h"
    4.13 -
    4.14  #include <UIKit/UIKit.h>
    4.15  
    4.16  extern BOOL SDL_UIKit_supports_multiple_displays;

     5.1 --- a/src/video/uikit/SDL_uikitview.h	Tue Sep 27 22:54:59 2011 +0200
     5.2 +++ b/src/video/uikit/SDL_uikitview.h	Tue Sep 27 23:40:21 2011 +0200
     5.3 @@ -20,8 +20,6 @@
     5.4  */
     5.5  
     5.6  #import <UIKit/UIKit.h>
     5.7 -#include "SDL_stdinc.h"
     5.8 -#include "SDL_events.h"
     5.9  #import "SDL_uikitviewcontroller.h"
    5.10  
    5.11  #define IPHONE_TOUCH_EFFICIENT_DANGEROUS

     6.1 --- a/src/video/uikit/SDL_uikitviewcontroller.h	Tue Sep 27 22:54:59 2011 +0200
     6.2 +++ b/src/video/uikit/SDL_uikitviewcontroller.h	Tue Sep 27 23:40:21 2011 +0200
     6.3 @@ -21,8 +21,7 @@
     6.4  
     6.5  #import <UIKit/UIKit.h>
     6.6  
     6.7 -#include "SDL_video.h"
     6.8 -
     6.9 +#include "../SDL_sysvideo.h"
    6.10  
    6.11  @interface SDL_uikitviewcontroller : UIViewController {
    6.12  @private

     7.1 --- a/src/video/uikit/SDL_uikitwindow.h	Tue Sep 27 22:54:59 2011 +0200
     7.2 +++ b/src/video/uikit/SDL_uikitwindow.h	Tue Sep 27 23:40:21 2011 +0200
     7.3 @@ -18,13 +18,12 @@
     7.4       misrepresented as being the original software.
     7.5    3. This notice may not be removed or altered from any source distribution.
     7.6  */
     7.7 -#include "SDL_config.h"
     7.8 -
     7.9  #ifndef _SDL_uikitwindow_h
    7.10  #define _SDL_uikitwindow_h
    7.11  
    7.12  #include "../SDL_sysvideo.h"
    7.13  #import "SDL_uikitopenglview.h"
    7.14 +#import "SDL_uikitviewcontroller.h"
    7.15  
    7.16  typedef struct SDL_WindowData SDL_WindowData;
    7.17