Make internal SDL sources include SDL_internal.h instead of SDL_config.h
authorRyan C. Gordon <icculus@icculus.org>
Sun, 24 Nov 2013 23:56:17 -0500
changeset 8093b43765095a6f
parent 8092 46fb898f098d
child 8094 9efaae827924
Make internal SDL sources include SDL_internal.h instead of SDL_config.h

The new header will include SDL_config.h, but allows for other global stuff.
src/SDL.c
src/SDL_assert.c
src/SDL_error.c
src/SDL_error_c.h
src/SDL_hints.c
src/SDL_internal.h
src/SDL_log.c
src/atomic/SDL_atomic.c
src/atomic/SDL_spinlock.c
src/audio/SDL_audio.c
src/audio/SDL_audio_c.h
src/audio/SDL_audiocvt.c
src/audio/SDL_audiodev.c
src/audio/SDL_audiodev_c.h
src/audio/SDL_audiomem.h
src/audio/SDL_audiotypecvt.c
src/audio/SDL_mixer.c
src/audio/SDL_sysaudio.h
src/audio/SDL_wave.c
src/audio/SDL_wave.h
src/audio/alsa/SDL_alsa_audio.c
src/audio/alsa/SDL_alsa_audio.h
src/audio/android/SDL_androidaudio.c
src/audio/android/SDL_androidaudio.h
src/audio/arts/SDL_artsaudio.c
src/audio/arts/SDL_artsaudio.h
src/audio/bsd/SDL_bsdaudio.c
src/audio/bsd/SDL_bsdaudio.h
src/audio/coreaudio/SDL_coreaudio.c
src/audio/coreaudio/SDL_coreaudio.h
src/audio/directsound/SDL_directsound.c
src/audio/directsound/SDL_directsound.h
src/audio/disk/SDL_diskaudio.c
src/audio/disk/SDL_diskaudio.h
src/audio/dsp/SDL_dspaudio.c
src/audio/dsp/SDL_dspaudio.h
src/audio/dummy/SDL_dummyaudio.c
src/audio/dummy/SDL_dummyaudio.h
src/audio/esd/SDL_esdaudio.c
src/audio/esd/SDL_esdaudio.h
src/audio/fusionsound/SDL_fsaudio.c
src/audio/fusionsound/SDL_fsaudio.h
src/audio/haiku/SDL_haikuaudio.cc
src/audio/haiku/SDL_haikuaudio.h
src/audio/nas/SDL_nasaudio.c
src/audio/nas/SDL_nasaudio.h
src/audio/paudio/SDL_paudio.c
src/audio/paudio/SDL_paudio.h
src/audio/pulseaudio/SDL_pulseaudio.c
src/audio/pulseaudio/SDL_pulseaudio.h
src/audio/qsa/SDL_qsa_audio.c
src/audio/qsa/SDL_qsa_audio.h
src/audio/sdlgenaudiocvt.pl
src/audio/sndio/SDL_sndioaudio.c
src/audio/sndio/SDL_sndioaudio.h
src/audio/sun/SDL_sunaudio.c
src/audio/sun/SDL_sunaudio.h
src/audio/winmm/SDL_winmm.c
src/audio/winmm/SDL_winmm.h
src/audio/xaudio2/SDL_xaudio2.c
src/core/android/SDL_android.c
src/core/android/SDL_android.h
src/core/linux/SDL_evdev.c
src/core/linux/SDL_evdev.h
src/core/linux/SDL_udev.h
src/core/windows/SDL_windows.c
src/cpuinfo/SDL_cpuinfo.c
src/events/SDL_clipboardevents.c
src/events/SDL_clipboardevents_c.h
src/events/SDL_dropevents.c
src/events/SDL_dropevents_c.h
src/events/SDL_events.c
src/events/SDL_events_c.h
src/events/SDL_gesture.c
src/events/SDL_gesture_c.h
src/events/SDL_keyboard.c
src/events/SDL_keyboard_c.h
src/events/SDL_mouse.c
src/events/SDL_mouse_c.h
src/events/SDL_quit.c
src/events/SDL_sysevents.h
src/events/SDL_touch.c
src/events/SDL_touch_c.h
src/events/SDL_windowevents.c
src/events/SDL_windowevents_c.h
src/file/SDL_rwops.c
src/filesystem/cocoa/SDL_sysfilesystem.m
src/filesystem/dummy/SDL_sysfilesystem.c
src/filesystem/haiku/SDL_sysfilesystem.cc
src/filesystem/unix/SDL_sysfilesystem.c
src/filesystem/windows/SDL_sysfilesystem.c
src/haptic/SDL_haptic.c
src/haptic/SDL_syshaptic.h
src/haptic/darwin/SDL_syshaptic.c
src/haptic/dummy/SDL_syshaptic.c
src/haptic/linux/SDL_syshaptic.c
src/haptic/windows/SDL_syshaptic.c
src/joystick/SDL_gamecontroller.c
src/joystick/SDL_gamecontrollerdb.h
src/joystick/SDL_joystick.c
src/joystick/SDL_joystick_c.h
src/joystick/SDL_sysjoystick.h
src/joystick/android/SDL_sysjoystick.c
src/joystick/bsd/SDL_sysjoystick.c
src/joystick/darwin/SDL_sysjoystick.c
src/joystick/darwin/SDL_sysjoystick_c.h
src/joystick/dummy/SDL_sysjoystick.c
src/joystick/haiku/SDL_haikujoystick.cc
src/joystick/iphoneos/SDL_sysjoystick.m
src/joystick/linux/SDL_sysjoystick.c
src/joystick/windows/SDL_dxjoystick.c
src/joystick/windows/SDL_dxjoystick_c.h
src/joystick/windows/SDL_mmjoystick.c
src/libm/math_libm.h
src/loadso/dlopen/SDL_sysloadso.c
src/loadso/dummy/SDL_sysloadso.c
src/loadso/haiku/SDL_sysloadso.c
src/loadso/windows/SDL_sysloadso.c
src/main/android/SDL_android_main.c
src/main/dummy/SDL_dummy_main.c
src/main/haiku/SDL_BApp.h
src/main/haiku/SDL_BeApp.cc
src/main/haiku/SDL_BeApp.h
src/power/SDL_power.c
src/power/android/SDL_syspower.c
src/power/haiku/SDL_syspower.c
src/power/linux/SDL_syspower.c
src/power/macosx/SDL_syspower.c
src/power/psp/SDL_syspower.c
src/power/uikit/SDL_syspower.h
src/power/uikit/SDL_syspower.m
src/power/windows/SDL_syspower.c
src/render/SDL_render.c
src/render/SDL_sysrender.h
src/render/SDL_yuv_mmx.c
src/render/SDL_yuv_sw.c
src/render/SDL_yuv_sw_c.h
src/render/direct3d/SDL_render_d3d.c
src/render/opengl/SDL_render_gl.c
src/render/opengl/SDL_shaders_gl.c
src/render/opengl/SDL_shaders_gl.h
src/render/opengles/SDL_render_gles.c
src/render/opengles2/SDL_render_gles2.c
src/render/opengles2/SDL_shaders_gles2.c
src/render/opengles2/SDL_shaders_gles2.h
src/render/psp/SDL_render_psp.c
src/render/software/SDL_blendfillrect.c
src/render/software/SDL_blendfillrect.h
src/render/software/SDL_blendline.c
src/render/software/SDL_blendline.h
src/render/software/SDL_blendpoint.c
src/render/software/SDL_blendpoint.h
src/render/software/SDL_draw.h
src/render/software/SDL_drawline.c
src/render/software/SDL_drawline.h
src/render/software/SDL_drawpoint.c
src/render/software/SDL_drawpoint.h
src/render/software/SDL_render_sw.c
src/render/software/SDL_rotate.c
src/stdlib/SDL_getenv.c
src/stdlib/SDL_iconv.c
src/stdlib/SDL_malloc.c
src/stdlib/SDL_qsort.c
src/stdlib/SDL_stdlib.c
src/stdlib/SDL_string.c
src/thread/SDL_systhread.h
src/thread/SDL_thread.c
src/thread/SDL_thread_c.h
src/thread/generic/SDL_syscond.c
src/thread/generic/SDL_sysmutex.c
src/thread/generic/SDL_sysmutex_c.h
src/thread/generic/SDL_syssem.c
src/thread/generic/SDL_systhread.c
src/thread/generic/SDL_systhread_c.h
src/thread/generic/SDL_systls.c
src/thread/psp/SDL_syscond.c
src/thread/psp/SDL_sysmutex.c
src/thread/psp/SDL_sysmutex_c.h
src/thread/pthread/SDL_syscond.c
src/thread/pthread/SDL_sysmutex.c
src/thread/pthread/SDL_sysmutex_c.h
src/thread/pthread/SDL_syssem.c
src/thread/pthread/SDL_systhread.c
src/thread/pthread/SDL_systhread_c.h
src/thread/pthread/SDL_systls.c
src/thread/windows/SDL_sysmutex.c
src/thread/windows/SDL_syssem.c
src/thread/windows/SDL_systhread.c
src/thread/windows/SDL_systhread_c.h
src/thread/windows/SDL_systls.c
src/timer/SDL_timer.c
src/timer/SDL_timer_c.h
src/timer/dummy/SDL_systimer.c
src/timer/haiku/SDL_systimer.c
src/timer/unix/SDL_systimer.c
src/timer/windows/SDL_systimer.c
src/video/SDL_RLEaccel.c
src/video/SDL_RLEaccel_c.h
src/video/SDL_blit.c
src/video/SDL_blit.h
src/video/SDL_blit_0.c
src/video/SDL_blit_1.c
src/video/SDL_blit_A.c
src/video/SDL_blit_N.c
src/video/SDL_blit_auto.c
src/video/SDL_blit_auto.h
src/video/SDL_blit_copy.c
src/video/SDL_blit_slow.c
src/video/SDL_blit_slow.h
src/video/SDL_bmp.c
src/video/SDL_clipboard.c
src/video/SDL_egl.c
src/video/SDL_egl_c.h
src/video/SDL_fillrect.c
src/video/SDL_pixels.c
src/video/SDL_pixels_c.h
src/video/SDL_rect.c
src/video/SDL_rect_c.h
src/video/SDL_shape.c
src/video/SDL_shape_internals.h
src/video/SDL_stretch.c
src/video/SDL_surface.c
src/video/SDL_sysvideo.h
src/video/SDL_video.c
src/video/android/SDL_androidclipboard.c
src/video/android/SDL_androidclipboard.h
src/video/android/SDL_androidevents.c
src/video/android/SDL_androidevents.h
src/video/android/SDL_androidgl.c
src/video/android/SDL_androidkeyboard.c
src/video/android/SDL_androidkeyboard.h
src/video/android/SDL_androidtouch.c
src/video/android/SDL_androidtouch.h
src/video/android/SDL_androidvideo.c
src/video/android/SDL_androidvideo.h
src/video/android/SDL_androidwindow.c
src/video/android/SDL_androidwindow.h
src/video/cocoa/SDL_cocoaclipboard.h
src/video/cocoa/SDL_cocoaclipboard.m
src/video/cocoa/SDL_cocoaevents.h
src/video/cocoa/SDL_cocoaevents.m
src/video/cocoa/SDL_cocoakeyboard.h
src/video/cocoa/SDL_cocoakeyboard.m
src/video/cocoa/SDL_cocoamessagebox.h
src/video/cocoa/SDL_cocoamessagebox.m
src/video/cocoa/SDL_cocoamodes.h
src/video/cocoa/SDL_cocoamodes.m
src/video/cocoa/SDL_cocoamouse.h
src/video/cocoa/SDL_cocoamouse.m
src/video/cocoa/SDL_cocoamousetap.h
src/video/cocoa/SDL_cocoamousetap.m
src/video/cocoa/SDL_cocoaopengl.h
src/video/cocoa/SDL_cocoaopengl.m
src/video/cocoa/SDL_cocoashape.h
src/video/cocoa/SDL_cocoashape.m
src/video/cocoa/SDL_cocoavideo.h
src/video/cocoa/SDL_cocoavideo.m
src/video/cocoa/SDL_cocoawindow.h
src/video/cocoa/SDL_cocoawindow.m
src/video/directfb/SDL_DirectFB_WM.c
src/video/directfb/SDL_DirectFB_dyn.c
src/video/directfb/SDL_DirectFB_events.c
src/video/directfb/SDL_DirectFB_modes.c
src/video/directfb/SDL_DirectFB_mouse.c
src/video/directfb/SDL_DirectFB_opengl.c
src/video/directfb/SDL_DirectFB_render.c
src/video/directfb/SDL_DirectFB_shape.c
src/video/directfb/SDL_DirectFB_video.c
src/video/directfb/SDL_DirectFB_video.h
src/video/directfb/SDL_DirectFB_window.c
src/video/dummy/SDL_nullevents.c
src/video/dummy/SDL_nullevents_c.h
src/video/dummy/SDL_nullframebuffer.c
src/video/dummy/SDL_nullframebuffer_c.h
src/video/dummy/SDL_nullvideo.c
src/video/dummy/SDL_nullvideo.h
src/video/haiku/SDL_BWin.h
src/video/haiku/SDL_bclipboard.cc
src/video/haiku/SDL_bclipboard.h
src/video/haiku/SDL_bevents.cc
src/video/haiku/SDL_bframebuffer.cc
src/video/haiku/SDL_bkeyboard.cc
src/video/haiku/SDL_bmodes.cc
src/video/haiku/SDL_bopengl.cc
src/video/haiku/SDL_bvideo.cc
src/video/haiku/SDL_bwindow.cc
src/video/pandora/SDL_pandora.c
src/video/pandora/SDL_pandora.h
src/video/pandora/SDL_pandora_events.c
src/video/pandora/SDL_pandora_events.h
src/video/psp/SDL_pspvideo.c
src/video/psp/SDL_pspvideo.h
src/video/raspberry/SDL_rpievents.c
src/video/raspberry/SDL_rpimouse.c
src/video/raspberry/SDL_rpiopengles.c
src/video/raspberry/SDL_rpiopengles.h
src/video/raspberry/SDL_rpivideo.c
src/video/raspberry/SDL_rpivideo.h
src/video/sdlgenblit.pl
src/video/uikit/SDL_uikitappdelegate.m
src/video/uikit/SDL_uikitevents.m
src/video/uikit/SDL_uikitmessagebox.h
src/video/uikit/SDL_uikitmessagebox.m
src/video/uikit/SDL_uikitmodes.h
src/video/uikit/SDL_uikitmodes.m
src/video/uikit/SDL_uikitopengles.m
src/video/uikit/SDL_uikitopenglview.m
src/video/uikit/SDL_uikitvideo.m
src/video/uikit/SDL_uikitview.m
src/video/uikit/SDL_uikitviewcontroller.m
src/video/uikit/SDL_uikitwindow.m
src/video/windows/SDL_windowsclipboard.c
src/video/windows/SDL_windowsclipboard.h
src/video/windows/SDL_windowsevents.c
src/video/windows/SDL_windowsevents.h
src/video/windows/SDL_windowsframebuffer.c
src/video/windows/SDL_windowsframebuffer.h
src/video/windows/SDL_windowskeyboard.c
src/video/windows/SDL_windowskeyboard.h
src/video/windows/SDL_windowsmessagebox.c
src/video/windows/SDL_windowsmessagebox.h
src/video/windows/SDL_windowsmodes.c
src/video/windows/SDL_windowsmodes.h
src/video/windows/SDL_windowsmouse.c
src/video/windows/SDL_windowsmouse.h
src/video/windows/SDL_windowsopengl.c
src/video/windows/SDL_windowsopengl.h
src/video/windows/SDL_windowsopengles.c
src/video/windows/SDL_windowsopengles.h
src/video/windows/SDL_windowsshape.c
src/video/windows/SDL_windowsshape.h
src/video/windows/SDL_windowsvideo.c
src/video/windows/SDL_windowsvideo.h
src/video/windows/SDL_windowswindow.c
src/video/windows/SDL_windowswindow.h
src/video/x11/SDL_x11clipboard.c
src/video/x11/SDL_x11clipboard.h
src/video/x11/SDL_x11dyn.c
src/video/x11/SDL_x11dyn.h
src/video/x11/SDL_x11events.c
src/video/x11/SDL_x11events.h
src/video/x11/SDL_x11framebuffer.c
src/video/x11/SDL_x11framebuffer.h
src/video/x11/SDL_x11keyboard.c
src/video/x11/SDL_x11keyboard.h
src/video/x11/SDL_x11messagebox.c
src/video/x11/SDL_x11modes.c
src/video/x11/SDL_x11modes.h
src/video/x11/SDL_x11mouse.c
src/video/x11/SDL_x11mouse.h
src/video/x11/SDL_x11opengl.c
src/video/x11/SDL_x11opengl.h
src/video/x11/SDL_x11opengles.c
src/video/x11/SDL_x11opengles.h
src/video/x11/SDL_x11shape.c
src/video/x11/SDL_x11shape.h
src/video/x11/SDL_x11touch.c
src/video/x11/SDL_x11touch.h
src/video/x11/SDL_x11video.c
src/video/x11/SDL_x11video.h
src/video/x11/SDL_x11window.c
src/video/x11/SDL_x11window.h
src/video/x11/SDL_x11xinput2.c
src/video/x11/SDL_x11xinput2.h
src/video/x11/imKStoUCS.c
     1.1 --- a/src/SDL.c	Mon Dec 09 13:30:35 2013 -0500
     1.2 +++ b/src/SDL.c	Sun Nov 24 23:56:17 2013 -0500
     1.3 @@ -18,7 +18,7 @@
     1.4       misrepresented as being the original software.
     1.5    3. This notice may not be removed or altered from any source distribution.
     1.6  */
     1.7 -#include "SDL_config.h"
     1.8 +#include "./SDL_internal.h"
     1.9  
    1.10  #if defined(__WIN32__)
    1.11  #include "core/windows/SDL_windows.h"
     2.1 --- a/src/SDL_assert.c	Mon Dec 09 13:30:35 2013 -0500
     2.2 +++ b/src/SDL_assert.c	Sun Nov 24 23:56:17 2013 -0500
     2.3 @@ -18,7 +18,7 @@
     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 +#include "./SDL_internal.h"
     2.9  
    2.10  #if defined(__WIN32__)
    2.11  #include "core/windows/SDL_windows.h"
     3.1 --- a/src/SDL_error.c	Mon Dec 09 13:30:35 2013 -0500
     3.2 +++ b/src/SDL_error.c	Sun Nov 24 23:56:17 2013 -0500
     3.3 @@ -18,7 +18,7 @@
     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 -#include "SDL_config.h"
     3.8 +#include "./SDL_internal.h"
     3.9  
    3.10  /* Simple error handling in SDL */
    3.11  
     4.1 --- a/src/SDL_error_c.h	Mon Dec 09 13:30:35 2013 -0500
     4.2 +++ b/src/SDL_error_c.h	Sun Nov 24 23:56:17 2013 -0500
     4.3 @@ -18,7 +18,7 @@
     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 +#include "./SDL_internal.h"
     4.9  
    4.10  /* This file defines a structure that carries language-independent
    4.11     error messages
     5.1 --- a/src/SDL_hints.c	Mon Dec 09 13:30:35 2013 -0500
     5.2 +++ b/src/SDL_hints.c	Sun Nov 24 23:56:17 2013 -0500
     5.3 @@ -18,7 +18,7 @@
     5.4       misrepresented as being the original software.
     5.5    3. This notice may not be removed or altered from any source distribution.
     5.6  */
     5.7 -#include "SDL_config.h"
     5.8 +#include "./SDL_internal.h"
     5.9  
    5.10  #include "SDL_hints.h"
    5.11  #include "SDL_error.h"
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/src/SDL_internal.h	Sun Nov 24 23:56:17 2013 -0500
     6.3 @@ -0,0 +1,28 @@
     6.4 +/*
     6.5 +  Simple DirectMedia Layer
     6.6 +  Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
     6.7 +
     6.8 +  This software is provided 'as-is', without any express or implied
     6.9 +  warranty.  In no event will the authors be held liable for any damages
    6.10 +  arising from the use of this software.
    6.11 +
    6.12 +  Permission is granted to anyone to use this software for any purpose,
    6.13 +  including commercial applications, and to alter it and redistribute it
    6.14 +  freely, subject to the following restrictions:
    6.15 +
    6.16 +  1. The origin of this software must not be misrepresented; you must not
    6.17 +     claim that you wrote the original software. If you use this software
    6.18 +     in a product, an acknowledgment in the product documentation would be
    6.19 +     appreciated but is not required.
    6.20 +  2. Altered source versions must be plainly marked as such, and must not be
    6.21 +     misrepresented as being the original software.
    6.22 +  3. This notice may not be removed or altered from any source distribution.
    6.23 +*/
    6.24 +#ifndef _SDL_internal_h
    6.25 +#define _SDL_internal_h
    6.26 +
    6.27 +#include "SDL_config.h"
    6.28 +
    6.29 +#endif
    6.30 +
    6.31 +/* vi: set ts=4 sw=4 expandtab: */
     7.1 --- a/src/SDL_log.c	Mon Dec 09 13:30:35 2013 -0500
     7.2 +++ b/src/SDL_log.c	Sun Nov 24 23:56:17 2013 -0500
     7.3 @@ -18,7 +18,7 @@
     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 +#include "./SDL_internal.h"
     7.9  
    7.10  #if defined(__WIN32__)
    7.11  #include "core/windows/SDL_windows.h"
     8.1 --- a/src/atomic/SDL_atomic.c	Mon Dec 09 13:30:35 2013 -0500
     8.2 +++ b/src/atomic/SDL_atomic.c	Sun Nov 24 23:56:17 2013 -0500
     8.3 @@ -18,7 +18,7 @@
     8.4       misrepresented as being the original software.
     8.5    3. This notice may not be removed or altered from any source distribution.
     8.6  */
     8.7 -#include "SDL_config.h"
     8.8 +#include "../SDL_internal.h"
     8.9  
    8.10  #include "SDL_atomic.h"
    8.11  
     9.1 --- a/src/atomic/SDL_spinlock.c	Mon Dec 09 13:30:35 2013 -0500
     9.2 +++ b/src/atomic/SDL_spinlock.c	Sun Nov 24 23:56:17 2013 -0500
     9.3 @@ -18,7 +18,7 @@
     9.4       misrepresented as being the original software.
     9.5    3. This notice may not be removed or altered from any source distribution.
     9.6  */
     9.7 -#include "SDL_config.h"
     9.8 +#include "../SDL_internal.h"
     9.9  
    9.10  #ifdef __WIN32__
    9.11  #include "../core/windows/SDL_windows.h"
    10.1 --- a/src/audio/SDL_audio.c	Mon Dec 09 13:30:35 2013 -0500
    10.2 +++ b/src/audio/SDL_audio.c	Sun Nov 24 23:56:17 2013 -0500
    10.3 @@ -18,7 +18,7 @@
    10.4       misrepresented as being the original software.
    10.5    3. This notice may not be removed or altered from any source distribution.
    10.6  */
    10.7 -#include "SDL_config.h"
    10.8 +#include "../SDL_internal.h"
    10.9  
   10.10  /* Allow access to a raw mixing buffer */
   10.11  
    11.1 --- a/src/audio/SDL_audio_c.h	Mon Dec 09 13:30:35 2013 -0500
    11.2 +++ b/src/audio/SDL_audio_c.h	Sun Nov 24 23:56:17 2013 -0500
    11.3 @@ -18,7 +18,7 @@
    11.4       misrepresented as being the original software.
    11.5    3. This notice may not be removed or altered from any source distribution.
    11.6  */
    11.7 -#include "SDL_config.h"
    11.8 +#include "../SDL_internal.h"
    11.9  
   11.10  /* Functions and variables exported from SDL_audio.c for SDL_sysaudio.c */
   11.11  
    12.1 --- a/src/audio/SDL_audiocvt.c	Mon Dec 09 13:30:35 2013 -0500
    12.2 +++ b/src/audio/SDL_audiocvt.c	Sun Nov 24 23:56:17 2013 -0500
    12.3 @@ -18,7 +18,7 @@
    12.4       misrepresented as being the original software.
    12.5    3. This notice may not be removed or altered from any source distribution.
    12.6  */
    12.7 -#include "SDL_config.h"
    12.8 +#include "../SDL_internal.h"
    12.9  
   12.10  /* Functions for audio drivers to perform runtime conversion of audio format */
   12.11  
    13.1 --- a/src/audio/SDL_audiodev.c	Mon Dec 09 13:30:35 2013 -0500
    13.2 +++ b/src/audio/SDL_audiodev.c	Sun Nov 24 23:56:17 2013 -0500
    13.3 @@ -18,7 +18,7 @@
    13.4       misrepresented as being the original software.
    13.5    3. This notice may not be removed or altered from any source distribution.
    13.6  */
    13.7 -#include "SDL_config.h"
    13.8 +#include "../SDL_internal.h"
    13.9  
   13.10  /* Get the name of the audio device we use for output */
   13.11  
    14.1 --- a/src/audio/SDL_audiodev_c.h	Mon Dec 09 13:30:35 2013 -0500
    14.2 +++ b/src/audio/SDL_audiodev_c.h	Sun Nov 24 23:56:17 2013 -0500
    14.3 @@ -19,7 +19,7 @@
    14.4    3. This notice may not be removed or altered from any source distribution.
    14.5  */
    14.6  #include "SDL.h"
    14.7 -#include "SDL_config.h"
    14.8 +#include "../SDL_internal.h"
    14.9  #include "SDL_sysaudio.h"
   14.10  
   14.11  /* Open the audio device for playback, and don't block if busy */
    15.1 --- a/src/audio/SDL_audiomem.h	Mon Dec 09 13:30:35 2013 -0500
    15.2 +++ b/src/audio/SDL_audiomem.h	Sun Nov 24 23:56:17 2013 -0500
    15.3 @@ -18,7 +18,7 @@
    15.4       misrepresented as being the original software.
    15.5    3. This notice may not be removed or altered from any source distribution.
    15.6  */
    15.7 -#include "SDL_config.h"
    15.8 +#include "../SDL_internal.h"
    15.9  
   15.10  #define SDL_AllocAudioMem   SDL_malloc
   15.11  #define SDL_FreeAudioMem    SDL_free
    16.1 --- a/src/audio/SDL_audiotypecvt.c	Mon Dec 09 13:30:35 2013 -0500
    16.2 +++ b/src/audio/SDL_audiotypecvt.c	Sun Nov 24 23:56:17 2013 -0500
    16.3 @@ -20,7 +20,7 @@
    16.4    3. This notice may not be removed or altered from any source distribution.
    16.5  */
    16.6  
    16.7 -#include "SDL_config.h"
    16.8 +#include "../SDL_internal.h"
    16.9  #include "SDL_audio.h"
   16.10  #include "SDL_audio_c.h"
   16.11  
    17.1 --- a/src/audio/SDL_mixer.c	Mon Dec 09 13:30:35 2013 -0500
    17.2 +++ b/src/audio/SDL_mixer.c	Sun Nov 24 23:56:17 2013 -0500
    17.3 @@ -18,7 +18,7 @@
    17.4       misrepresented as being the original software.
    17.5    3. This notice may not be removed or altered from any source distribution.
    17.6  */
    17.7 -#include "SDL_config.h"
    17.8 +#include "../SDL_internal.h"
    17.9  
   17.10  /* This provides the default mixing callback for the SDL audio routines */
   17.11  
    18.1 --- a/src/audio/SDL_sysaudio.h	Mon Dec 09 13:30:35 2013 -0500
    18.2 +++ b/src/audio/SDL_sysaudio.h	Sun Nov 24 23:56:17 2013 -0500
    18.3 @@ -18,7 +18,7 @@
    18.4       misrepresented as being the original software.
    18.5    3. This notice may not be removed or altered from any source distribution.
    18.6  */
    18.7 -#include "SDL_config.h"
    18.8 +#include "../SDL_internal.h"
    18.9  
   18.10  #ifndef _SDL_sysaudio_h
   18.11  #define _SDL_sysaudio_h
    19.1 --- a/src/audio/SDL_wave.c	Mon Dec 09 13:30:35 2013 -0500
    19.2 +++ b/src/audio/SDL_wave.c	Sun Nov 24 23:56:17 2013 -0500
    19.3 @@ -18,7 +18,7 @@
    19.4       misrepresented as being the original software.
    19.5    3. This notice may not be removed or altered from any source distribution.
    19.6  */
    19.7 -#include "SDL_config.h"
    19.8 +#include "../SDL_internal.h"
    19.9  
   19.10  /* Microsoft WAVE file loading routines */
   19.11  
    20.1 --- a/src/audio/SDL_wave.h	Mon Dec 09 13:30:35 2013 -0500
    20.2 +++ b/src/audio/SDL_wave.h	Sun Nov 24 23:56:17 2013 -0500
    20.3 @@ -18,7 +18,7 @@
    20.4       misrepresented as being the original software.
    20.5    3. This notice may not be removed or altered from any source distribution.
    20.6  */
    20.7 -#include "SDL_config.h"
    20.8 +#include "../SDL_internal.h"
    20.9  
   20.10  /* WAVE files are little-endian */
   20.11  
    21.1 --- a/src/audio/alsa/SDL_alsa_audio.c	Mon Dec 09 13:30:35 2013 -0500
    21.2 +++ b/src/audio/alsa/SDL_alsa_audio.c	Sun Nov 24 23:56:17 2013 -0500
    21.3 @@ -18,7 +18,7 @@
    21.4       misrepresented as being the original software.
    21.5    3. This notice may not be removed or altered from any source distribution.
    21.6  */
    21.7 -#include "SDL_config.h"
    21.8 +#include "../../SDL_internal.h"
    21.9  
   21.10  #if SDL_AUDIO_DRIVER_ALSA
   21.11  
    22.1 --- a/src/audio/alsa/SDL_alsa_audio.h	Mon Dec 09 13:30:35 2013 -0500
    22.2 +++ b/src/audio/alsa/SDL_alsa_audio.h	Sun Nov 24 23:56:17 2013 -0500
    22.3 @@ -18,7 +18,7 @@
    22.4       misrepresented as being the original software.
    22.5    3. This notice may not be removed or altered from any source distribution.
    22.6  */
    22.7 -#include "SDL_config.h"
    22.8 +#include "../../SDL_internal.h"
    22.9  
   22.10  #ifndef _SDL_ALSA_audio_h
   22.11  #define _SDL_ALSA_audio_h
    23.1 --- a/src/audio/android/SDL_androidaudio.c	Mon Dec 09 13:30:35 2013 -0500
    23.2 +++ b/src/audio/android/SDL_androidaudio.c	Sun Nov 24 23:56:17 2013 -0500
    23.3 @@ -18,7 +18,7 @@
    23.4       misrepresented as being the original software.
    23.5    3. This notice may not be removed or altered from any source distribution.
    23.6  */
    23.7 -#include "SDL_config.h"
    23.8 +#include "../../SDL_internal.h"
    23.9  
   23.10  #if SDL_AUDIO_DRIVER_ANDROID
   23.11  
    24.1 --- a/src/audio/android/SDL_androidaudio.h	Mon Dec 09 13:30:35 2013 -0500
    24.2 +++ b/src/audio/android/SDL_androidaudio.h	Sun Nov 24 23:56:17 2013 -0500
    24.3 @@ -18,7 +18,7 @@
    24.4       misrepresented as being the original software.
    24.5    3. This notice may not be removed or altered from any source distribution.
    24.6  */
    24.7 -#include "SDL_config.h"
    24.8 +#include "../../SDL_internal.h"
    24.9  
   24.10  #ifndef _SDL_androidaudio_h
   24.11  #define _SDL_androidaudio_h
    25.1 --- a/src/audio/arts/SDL_artsaudio.c	Mon Dec 09 13:30:35 2013 -0500
    25.2 +++ b/src/audio/arts/SDL_artsaudio.c	Sun Nov 24 23:56:17 2013 -0500
    25.3 @@ -18,7 +18,7 @@
    25.4       misrepresented as being the original software.
    25.5    3. This notice may not be removed or altered from any source distribution.
    25.6  */
    25.7 -#include "SDL_config.h"
    25.8 +#include "../../SDL_internal.h"
    25.9  
   25.10  #if SDL_AUDIO_DRIVER_ARTS
   25.11  
    26.1 --- a/src/audio/arts/SDL_artsaudio.h	Mon Dec 09 13:30:35 2013 -0500
    26.2 +++ b/src/audio/arts/SDL_artsaudio.h	Sun Nov 24 23:56:17 2013 -0500
    26.3 @@ -18,7 +18,7 @@
    26.4       misrepresented as being the original software.
    26.5    3. This notice may not be removed or altered from any source distribution.
    26.6  */
    26.7 -#include "SDL_config.h"
    26.8 +#include "../../SDL_internal.h"
    26.9  
   26.10  #ifndef _SDL_artscaudio_h
   26.11  #define _SDL_artscaudio_h
    27.1 --- a/src/audio/bsd/SDL_bsdaudio.c	Mon Dec 09 13:30:35 2013 -0500
    27.2 +++ b/src/audio/bsd/SDL_bsdaudio.c	Sun Nov 24 23:56:17 2013 -0500
    27.3 @@ -18,7 +18,7 @@
    27.4       misrepresented as being the original software.
    27.5    3. This notice may not be removed or altered from any source distribution.
    27.6  */
    27.7 -#include "SDL_config.h"
    27.8 +#include "../../SDL_internal.h"
    27.9  
   27.10  #if SDL_AUDIO_DRIVER_BSD
   27.11  
    28.1 --- a/src/audio/bsd/SDL_bsdaudio.h	Mon Dec 09 13:30:35 2013 -0500
    28.2 +++ b/src/audio/bsd/SDL_bsdaudio.h	Sun Nov 24 23:56:17 2013 -0500
    28.3 @@ -18,7 +18,7 @@
    28.4       misrepresented as being the original software.
    28.5    3. This notice may not be removed or altered from any source distribution.
    28.6  */
    28.7 -#include "SDL_config.h"
    28.8 +#include "../../SDL_internal.h"
    28.9  
   28.10  #ifndef _SDL_bsdaudio_h
   28.11  #define _SDL_bsdaudio_h
    29.1 --- a/src/audio/coreaudio/SDL_coreaudio.c	Mon Dec 09 13:30:35 2013 -0500
    29.2 +++ b/src/audio/coreaudio/SDL_coreaudio.c	Sun Nov 24 23:56:17 2013 -0500
    29.3 @@ -18,7 +18,7 @@
    29.4       misrepresented as being the original software.
    29.5    3. This notice may not be removed or altered from any source distribution.
    29.6  */
    29.7 -#include "SDL_config.h"
    29.8 +#include "../../SDL_internal.h"
    29.9  #include "SDL_audio.h"
   29.10  #include "../SDL_audio_c.h"
   29.11  #include "../SDL_sysaudio.h"
    30.1 --- a/src/audio/coreaudio/SDL_coreaudio.h	Mon Dec 09 13:30:35 2013 -0500
    30.2 +++ b/src/audio/coreaudio/SDL_coreaudio.h	Sun Nov 24 23:56:17 2013 -0500
    30.3 @@ -18,7 +18,7 @@
    30.4       misrepresented as being the original software.
    30.5    3. This notice may not be removed or altered from any source distribution.
    30.6  */
    30.7 -#include "SDL_config.h"
    30.8 +#include "../../SDL_internal.h"
    30.9  
   30.10  #ifndef _SDL_coreaudio_h
   30.11  #define _SDL_coreaudio_h
    31.1 --- a/src/audio/directsound/SDL_directsound.c	Mon Dec 09 13:30:35 2013 -0500
    31.2 +++ b/src/audio/directsound/SDL_directsound.c	Sun Nov 24 23:56:17 2013 -0500
    31.3 @@ -18,7 +18,7 @@
    31.4       misrepresented as being the original software.
    31.5    3. This notice may not be removed or altered from any source distribution.
    31.6  */
    31.7 -#include "SDL_config.h"
    31.8 +#include "../../SDL_internal.h"
    31.9  
   31.10  #if SDL_AUDIO_DRIVER_DSOUND
   31.11  
    32.1 --- a/src/audio/directsound/SDL_directsound.h	Mon Dec 09 13:30:35 2013 -0500
    32.2 +++ b/src/audio/directsound/SDL_directsound.h	Sun Nov 24 23:56:17 2013 -0500
    32.3 @@ -18,7 +18,7 @@
    32.4       misrepresented as being the original software.
    32.5    3. This notice may not be removed or altered from any source distribution.
    32.6  */
    32.7 -#include "SDL_config.h"
    32.8 +#include "../../SDL_internal.h"
    32.9  
   32.10  #ifndef _SDL_directsound_h
   32.11  #define _SDL_directsound_h
    33.1 --- a/src/audio/disk/SDL_diskaudio.c	Mon Dec 09 13:30:35 2013 -0500
    33.2 +++ b/src/audio/disk/SDL_diskaudio.c	Sun Nov 24 23:56:17 2013 -0500
    33.3 @@ -18,7 +18,7 @@
    33.4       misrepresented as being the original software.
    33.5    3. This notice may not be removed or altered from any source distribution.
    33.6  */
    33.7 -#include "SDL_config.h"
    33.8 +#include "../../SDL_internal.h"
    33.9  
   33.10  #if SDL_AUDIO_DRIVER_DISK
   33.11  
    34.1 --- a/src/audio/disk/SDL_diskaudio.h	Mon Dec 09 13:30:35 2013 -0500
    34.2 +++ b/src/audio/disk/SDL_diskaudio.h	Sun Nov 24 23:56:17 2013 -0500
    34.3 @@ -18,7 +18,7 @@
    34.4       misrepresented as being the original software.
    34.5    3. This notice may not be removed or altered from any source distribution.
    34.6  */
    34.7 -#include "SDL_config.h"
    34.8 +#include "../../SDL_internal.h"
    34.9  
   34.10  #ifndef _SDL_diskaudio_h
   34.11  #define _SDL_diskaudio_h
    35.1 --- a/src/audio/dsp/SDL_dspaudio.c	Mon Dec 09 13:30:35 2013 -0500
    35.2 +++ b/src/audio/dsp/SDL_dspaudio.c	Sun Nov 24 23:56:17 2013 -0500
    35.3 @@ -18,7 +18,7 @@
    35.4       misrepresented as being the original software.
    35.5    3. This notice may not be removed or altered from any source distribution.
    35.6  */
    35.7 -#include "SDL_config.h"
    35.8 +#include "../../SDL_internal.h"
    35.9  
   35.10  #if SDL_AUDIO_DRIVER_OSS
   35.11  
    36.1 --- a/src/audio/dsp/SDL_dspaudio.h	Mon Dec 09 13:30:35 2013 -0500
    36.2 +++ b/src/audio/dsp/SDL_dspaudio.h	Sun Nov 24 23:56:17 2013 -0500
    36.3 @@ -18,7 +18,7 @@
    36.4       misrepresented as being the original software.
    36.5    3. This notice may not be removed or altered from any source distribution.
    36.6  */
    36.7 -#include "SDL_config.h"
    36.8 +#include "../../SDL_internal.h"
    36.9  
   36.10  #ifndef _SDL_dspaudio_h
   36.11  #define _SDL_dspaudio_h
    37.1 --- a/src/audio/dummy/SDL_dummyaudio.c	Mon Dec 09 13:30:35 2013 -0500
    37.2 +++ b/src/audio/dummy/SDL_dummyaudio.c	Sun Nov 24 23:56:17 2013 -0500
    37.3 @@ -18,7 +18,7 @@
    37.4       misrepresented as being the original software.
    37.5    3. This notice may not be removed or altered from any source distribution.
    37.6  */
    37.7 -#include "SDL_config.h"
    37.8 +#include "../../SDL_internal.h"
    37.9  
   37.10  /* Output audio to nowhere... */
   37.11  
    38.1 --- a/src/audio/dummy/SDL_dummyaudio.h	Mon Dec 09 13:30:35 2013 -0500
    38.2 +++ b/src/audio/dummy/SDL_dummyaudio.h	Sun Nov 24 23:56:17 2013 -0500
    38.3 @@ -18,7 +18,7 @@
    38.4       misrepresented as being the original software.
    38.5    3. This notice may not be removed or altered from any source distribution.
    38.6  */
    38.7 -#include "SDL_config.h"
    38.8 +#include "../../SDL_internal.h"
    38.9  
   38.10  #ifndef _SDL_dummyaudio_h
   38.11  #define _SDL_dummyaudio_h
    39.1 --- a/src/audio/esd/SDL_esdaudio.c	Mon Dec 09 13:30:35 2013 -0500
    39.2 +++ b/src/audio/esd/SDL_esdaudio.c	Sun Nov 24 23:56:17 2013 -0500
    39.3 @@ -18,7 +18,7 @@
    39.4       misrepresented as being the original software.
    39.5    3. This notice may not be removed or altered from any source distribution.
    39.6  */
    39.7 -#include "SDL_config.h"
    39.8 +#include "../../SDL_internal.h"
    39.9  
   39.10  #if SDL_AUDIO_DRIVER_ESD
   39.11  
    40.1 --- a/src/audio/esd/SDL_esdaudio.h	Mon Dec 09 13:30:35 2013 -0500
    40.2 +++ b/src/audio/esd/SDL_esdaudio.h	Sun Nov 24 23:56:17 2013 -0500
    40.3 @@ -18,7 +18,7 @@
    40.4       misrepresented as being the original software.
    40.5    3. This notice may not be removed or altered from any source distribution.
    40.6  */
    40.7 -#include "SDL_config.h"
    40.8 +#include "../../SDL_internal.h"
    40.9  
   40.10  #ifndef _SDL_esdaudio_h
   40.11  #define _SDL_esdaudio_h
    41.1 --- a/src/audio/fusionsound/SDL_fsaudio.c	Mon Dec 09 13:30:35 2013 -0500
    41.2 +++ b/src/audio/fusionsound/SDL_fsaudio.c	Sun Nov 24 23:56:17 2013 -0500
    41.3 @@ -18,7 +18,7 @@
    41.4       misrepresented as being the original software.
    41.5    3. This notice may not be removed or altered from any source distribution.
    41.6  */
    41.7 -#include "SDL_config.h"
    41.8 +#include "../../SDL_internal.h"
    41.9  
   41.10  #if SDL_AUDIO_DRIVER_FUSIONSOUND
   41.11  
    42.1 --- a/src/audio/fusionsound/SDL_fsaudio.h	Mon Dec 09 13:30:35 2013 -0500
    42.2 +++ b/src/audio/fusionsound/SDL_fsaudio.h	Sun Nov 24 23:56:17 2013 -0500
    42.3 @@ -18,7 +18,7 @@
    42.4       misrepresented as being the original software.
    42.5    3. This notice may not be removed or altered from any source distribution.
    42.6  */
    42.7 -#include "SDL_config.h"
    42.8 +#include "../../SDL_internal.h"
    42.9  
   42.10  #ifndef _SDL_fsaudio_h
   42.11  #define _SDL_fsaudio_h
    43.1 --- a/src/audio/haiku/SDL_haikuaudio.cc	Mon Dec 09 13:30:35 2013 -0500
    43.2 +++ b/src/audio/haiku/SDL_haikuaudio.cc	Sun Nov 24 23:56:17 2013 -0500
    43.3 @@ -18,7 +18,7 @@
    43.4       misrepresented as being the original software.
    43.5    3. This notice may not be removed or altered from any source distribution.
    43.6  */
    43.7 -#include "SDL_config.h"
    43.8 +#include "../../SDL_internal.h"
    43.9  
   43.10  #if SDL_AUDIO_DRIVER_HAIKU
   43.11  
    44.1 --- a/src/audio/haiku/SDL_haikuaudio.h	Mon Dec 09 13:30:35 2013 -0500
    44.2 +++ b/src/audio/haiku/SDL_haikuaudio.h	Sun Nov 24 23:56:17 2013 -0500
    44.3 @@ -18,7 +18,7 @@
    44.4       misrepresented as being the original software.
    44.5    3. This notice may not be removed or altered from any source distribution.
    44.6  */
    44.7 -#include "SDL_config.h"
    44.8 +#include "../../SDL_internal.h"
    44.9  
   44.10  #ifndef _SDL_beaudio_h
   44.11  #define _SDL_beaudio_h
    45.1 --- a/src/audio/nas/SDL_nasaudio.c	Mon Dec 09 13:30:35 2013 -0500
    45.2 +++ b/src/audio/nas/SDL_nasaudio.c	Sun Nov 24 23:56:17 2013 -0500
    45.3 @@ -18,7 +18,7 @@
    45.4       misrepresented as being the original software.
    45.5    3. This notice may not be removed or altered from any source distribution.
    45.6  */
    45.7 -#include "SDL_config.h"
    45.8 +#include "../../SDL_internal.h"
    45.9  
   45.10  #if SDL_AUDIO_DRIVER_NAS
   45.11  
    46.1 --- a/src/audio/nas/SDL_nasaudio.h	Mon Dec 09 13:30:35 2013 -0500
    46.2 +++ b/src/audio/nas/SDL_nasaudio.h	Sun Nov 24 23:56:17 2013 -0500
    46.3 @@ -18,7 +18,7 @@
    46.4       misrepresented as being the original software.
    46.5    3. This notice may not be removed or altered from any source distribution.
    46.6  */
    46.7 -#include "SDL_config.h"
    46.8 +#include "../../SDL_internal.h"
    46.9  
   46.10  #ifndef _SDL_nasaudio_h
   46.11  #define _SDL_nasaudio_h
    47.1 --- a/src/audio/paudio/SDL_paudio.c	Mon Dec 09 13:30:35 2013 -0500
    47.2 +++ b/src/audio/paudio/SDL_paudio.c	Sun Nov 24 23:56:17 2013 -0500
    47.3 @@ -18,7 +18,7 @@
    47.4       misrepresented as being the original software.
    47.5    3. This notice may not be removed or altered from any source distribution.
    47.6  */
    47.7 -#include "SDL_config.h"
    47.8 +#include "../../SDL_internal.h"
    47.9  
   47.10  #if SDL_AUDIO_DRIVER_PAUDIO
   47.11  
    48.1 --- a/src/audio/paudio/SDL_paudio.h	Mon Dec 09 13:30:35 2013 -0500
    48.2 +++ b/src/audio/paudio/SDL_paudio.h	Sun Nov 24 23:56:17 2013 -0500
    48.3 @@ -18,7 +18,7 @@
    48.4       misrepresented as being the original software.
    48.5    3. This notice may not be removed or altered from any source distribution.
    48.6  */
    48.7 -#include "SDL_config.h"
    48.8 +#include "../../SDL_internal.h"
    48.9  
   48.10  #ifndef _SDL_paudaudio_h
   48.11  #define _SDL_paudaudio_h
    49.1 --- a/src/audio/pulseaudio/SDL_pulseaudio.c	Mon Dec 09 13:30:35 2013 -0500
    49.2 +++ b/src/audio/pulseaudio/SDL_pulseaudio.c	Sun Nov 24 23:56:17 2013 -0500
    49.3 @@ -25,7 +25,7 @@
    49.4     was the cleanest way to move it to 1.3. The 1.2 target was written by
    49.5     St├ęphan Kochen: stephan .a.t. kochen.nl
    49.6  */
    49.7 -#include "SDL_config.h"
    49.8 +#include "../../SDL_internal.h"
    49.9  
   49.10  #if SDL_AUDIO_DRIVER_PULSEAUDIO
   49.11  
    50.1 --- a/src/audio/pulseaudio/SDL_pulseaudio.h	Mon Dec 09 13:30:35 2013 -0500
    50.2 +++ b/src/audio/pulseaudio/SDL_pulseaudio.h	Sun Nov 24 23:56:17 2013 -0500
    50.3 @@ -18,7 +18,7 @@
    50.4       misrepresented as being the original software.
    50.5    3. This notice may not be removed or altered from any source distribution.
    50.6  */
    50.7 -#include "SDL_config.h"
    50.8 +#include "../../SDL_internal.h"
    50.9  
   50.10  #ifndef _SDL_pulseaudio_h
   50.11  #define _SDL_pulseaudio_h
    51.1 --- a/src/audio/qsa/SDL_qsa_audio.c	Mon Dec 09 13:30:35 2013 -0500
    51.2 +++ b/src/audio/qsa/SDL_qsa_audio.c	Sun Nov 24 23:56:17 2013 -0500
    51.3 @@ -19,7 +19,7 @@
    51.4    3. This notice may not be removed or altered from any source distribution.
    51.5  */
    51.6  
    51.7 -#include "SDL_config.h"
    51.8 +#include "../../SDL_internal.h"
    51.9  
   51.10  #if SDL_AUDIO_DRIVER_QSA
   51.11  
    52.1 --- a/src/audio/qsa/SDL_qsa_audio.h	Mon Dec 09 13:30:35 2013 -0500
    52.2 +++ b/src/audio/qsa/SDL_qsa_audio.h	Sun Nov 24 23:56:17 2013 -0500
    52.3 @@ -19,7 +19,7 @@
    52.4    3. This notice may not be removed or altered from any source distribution.
    52.5  */
    52.6  
    52.7 -#include "SDL_config.h"
    52.8 +#include "../../SDL_internal.h"
    52.9  
   52.10  #ifndef __SDL_QSA_AUDIO_H__
   52.11  #define __SDL_QSA_AUDIO_H__
    53.1 --- a/src/audio/sdlgenaudiocvt.pl	Mon Dec 09 13:30:35 2013 -0500
    53.2 +++ b/src/audio/sdlgenaudiocvt.pl	Sun Nov 24 23:56:17 2013 -0500
    53.3 @@ -57,7 +57,7 @@
    53.4    3. This notice may not be removed or altered from any source distribution.
    53.5  */
    53.6  
    53.7 -#include "SDL_config.h"
    53.8 +#include "../SDL_internal.h"
    53.9  #include "SDL_audio.h"
   53.10  #include "SDL_audio_c.h"
   53.11  
    54.1 --- a/src/audio/sndio/SDL_sndioaudio.c	Mon Dec 09 13:30:35 2013 -0500
    54.2 +++ b/src/audio/sndio/SDL_sndioaudio.c	Sun Nov 24 23:56:17 2013 -0500
    54.3 @@ -19,7 +19,7 @@
    54.4    3. This notice may not be removed or altered from any source distribution.
    54.5  */
    54.6  
    54.7 -#include "SDL_config.h"
    54.8 +#include "../../SDL_internal.h"
    54.9  
   54.10  #if SDL_AUDIO_DRIVER_SNDIO
   54.11  
    55.1 --- a/src/audio/sndio/SDL_sndioaudio.h	Mon Dec 09 13:30:35 2013 -0500
    55.2 +++ b/src/audio/sndio/SDL_sndioaudio.h	Sun Nov 24 23:56:17 2013 -0500
    55.3 @@ -18,7 +18,7 @@
    55.4       misrepresented as being the original software.
    55.5    3. This notice may not be removed or altered from any source distribution.
    55.6  */
    55.7 -#include "SDL_config.h"
    55.8 +#include "../../SDL_internal.h"
    55.9  
   55.10  #ifndef _SDL_sndioaudio_h
   55.11  #define _SDL_sndioaudio_h
    56.1 --- a/src/audio/sun/SDL_sunaudio.c	Mon Dec 09 13:30:35 2013 -0500
    56.2 +++ b/src/audio/sun/SDL_sunaudio.c	Sun Nov 24 23:56:17 2013 -0500
    56.3 @@ -18,7 +18,7 @@
    56.4       misrepresented as being the original software.
    56.5    3. This notice may not be removed or altered from any source distribution.
    56.6  */
    56.7 -#include "SDL_config.h"
    56.8 +#include "../../SDL_internal.h"
    56.9  
   56.10  #if SDL_AUDIO_DRIVER_SUNAUDIO
   56.11  
    57.1 --- a/src/audio/sun/SDL_sunaudio.h	Mon Dec 09 13:30:35 2013 -0500
    57.2 +++ b/src/audio/sun/SDL_sunaudio.h	Sun Nov 24 23:56:17 2013 -0500
    57.3 @@ -18,7 +18,7 @@
    57.4       misrepresented as being the original software.
    57.5    3. This notice may not be removed or altered from any source distribution.
    57.6  */
    57.7 -#include "SDL_config.h"
    57.8 +#include "../../SDL_internal.h"
    57.9  
   57.10  #ifndef _SDL_sunaudio_h
   57.11  #define _SDL_sunaudio_h
    58.1 --- a/src/audio/winmm/SDL_winmm.c	Mon Dec 09 13:30:35 2013 -0500
    58.2 +++ b/src/audio/winmm/SDL_winmm.c	Sun Nov 24 23:56:17 2013 -0500
    58.3 @@ -18,7 +18,7 @@
    58.4       misrepresented as being the original software.
    58.5    3. This notice may not be removed or altered from any source distribution.
    58.6  */
    58.7 -#include "SDL_config.h"
    58.8 +#include "../../SDL_internal.h"
    58.9  
   58.10  #if SDL_AUDIO_DRIVER_WINMM
   58.11  
    59.1 --- a/src/audio/winmm/SDL_winmm.h	Mon Dec 09 13:30:35 2013 -0500
    59.2 +++ b/src/audio/winmm/SDL_winmm.h	Sun Nov 24 23:56:17 2013 -0500
    59.3 @@ -18,7 +18,7 @@
    59.4       misrepresented as being the original software.
    59.5    3. This notice may not be removed or altered from any source distribution.
    59.6  */
    59.7 -#include "SDL_config.h"
    59.8 +#include "../../SDL_internal.h"
    59.9  
   59.10  #ifndef _SDL_winmm_h
   59.11  #define _SDL_winmm_h
    60.1 --- a/src/audio/xaudio2/SDL_xaudio2.c	Mon Dec 09 13:30:35 2013 -0500
    60.2 +++ b/src/audio/xaudio2/SDL_xaudio2.c	Sun Nov 24 23:56:17 2013 -0500
    60.3 @@ -18,7 +18,7 @@
    60.4       misrepresented as being the original software.
    60.5    3. This notice may not be removed or altered from any source distribution.
    60.6  */
    60.7 -#include "SDL_config.h"
    60.8 +#include "../../SDL_internal.h"
    60.9  
   60.10  #if SDL_AUDIO_DRIVER_XAUDIO2
   60.11  
    61.1 --- a/src/core/android/SDL_android.c	Mon Dec 09 13:30:35 2013 -0500
    61.2 +++ b/src/core/android/SDL_android.c	Sun Nov 24 23:56:17 2013 -0500
    61.3 @@ -18,7 +18,7 @@
    61.4       misrepresented as being the original software.
    61.5    3. This notice may not be removed or altered from any source distribution.
    61.6  */
    61.7 -#include "SDL_config.h"
    61.8 +#include "../../SDL_internal.h"
    61.9  #include "SDL_stdinc.h"
   61.10  #include "SDL_assert.h"
   61.11  #include "SDL_log.h"
    62.1 --- a/src/core/android/SDL_android.h	Mon Dec 09 13:30:35 2013 -0500
    62.2 +++ b/src/core/android/SDL_android.h	Sun Nov 24 23:56:17 2013 -0500
    62.3 @@ -18,7 +18,7 @@
    62.4       misrepresented as being the original software.
    62.5    3. This notice may not be removed or altered from any source distribution.
    62.6  */
    62.7 -#include "SDL_config.h"
    62.8 +#include "../../SDL_internal.h"
    62.9  
   62.10  /* Set up for C function definitions, even when using C++ */
   62.11  #ifdef __cplusplus
    63.1 --- a/src/core/linux/SDL_evdev.c	Mon Dec 09 13:30:35 2013 -0500
    63.2 +++ b/src/core/linux/SDL_evdev.c	Sun Nov 24 23:56:17 2013 -0500
    63.3 @@ -18,7 +18,7 @@
    63.4       misrepresented as being the original software.
    63.5    3. This notice may not be removed or altered from any source distribution.
    63.6  */
    63.7 -#include "SDL_config.h"
    63.8 +#include "../../SDL_internal.h"
    63.9  
   63.10  #ifdef SDL_INPUT_LINUXEV
   63.11  
    64.1 --- a/src/core/linux/SDL_evdev.h	Mon Dec 09 13:30:35 2013 -0500
    64.2 +++ b/src/core/linux/SDL_evdev.h	Sun Nov 24 23:56:17 2013 -0500
    64.3 @@ -19,7 +19,7 @@
    64.4    3. This notice may not be removed or altered from any source distribution.
    64.5  */
    64.6  
    64.7 -#include "SDL_config.h"
    64.8 +#include "../../SDL_internal.h"
    64.9  
   64.10  #ifndef _SDL_evdev_h
   64.11  #define _SDL_evdev_h
    65.1 --- a/src/core/linux/SDL_udev.h	Mon Dec 09 13:30:35 2013 -0500
    65.2 +++ b/src/core/linux/SDL_udev.h	Sun Nov 24 23:56:17 2013 -0500
    65.3 @@ -19,7 +19,7 @@
    65.4    3. This notice may not be removed or altered from any source distribution.
    65.5  */
    65.6  
    65.7 -#include "SDL_config.h"
    65.8 +#include "../../SDL_internal.h"
    65.9  
   65.10  #ifndef _SDL_udev_h
   65.11  #define _SDL_udev_h
    66.1 --- a/src/core/windows/SDL_windows.c	Mon Dec 09 13:30:35 2013 -0500
    66.2 +++ b/src/core/windows/SDL_windows.c	Sun Nov 24 23:56:17 2013 -0500
    66.3 @@ -18,7 +18,7 @@
    66.4       misrepresented as being the original software.
    66.5    3. This notice may not be removed or altered from any source distribution.
    66.6  */
    66.7 -#include "SDL_config.h"
    66.8 +#include "../../SDL_internal.h"
    66.9  
   66.10  #ifdef __WIN32__
   66.11  
    67.1 --- a/src/cpuinfo/SDL_cpuinfo.c	Mon Dec 09 13:30:35 2013 -0500
    67.2 +++ b/src/cpuinfo/SDL_cpuinfo.c	Sun Nov 24 23:56:17 2013 -0500
    67.3 @@ -18,7 +18,7 @@
    67.4       misrepresented as being the original software.
    67.5    3. This notice may not be removed or altered from any source distribution.
    67.6  */
    67.7 -#include "SDL_config.h"
    67.8 +#include "../SDL_internal.h"
    67.9  
   67.10  #if defined(__WIN32__)
   67.11  #include "../core/windows/SDL_windows.h"
    68.1 --- a/src/events/SDL_clipboardevents.c	Mon Dec 09 13:30:35 2013 -0500
    68.2 +++ b/src/events/SDL_clipboardevents.c	Sun Nov 24 23:56:17 2013 -0500
    68.3 @@ -18,7 +18,7 @@
    68.4       misrepresented as being the original software.
    68.5    3. This notice may not be removed or altered from any source distribution.
    68.6  */
    68.7 -#include "SDL_config.h"
    68.8 +#include "../SDL_internal.h"
    68.9  
   68.10  /* Clipboard event handling code for SDL */
   68.11  
    69.1 --- a/src/events/SDL_clipboardevents_c.h	Mon Dec 09 13:30:35 2013 -0500
    69.2 +++ b/src/events/SDL_clipboardevents_c.h	Sun Nov 24 23:56:17 2013 -0500
    69.3 @@ -18,7 +18,7 @@
    69.4       misrepresented as being the original software.
    69.5    3. This notice may not be removed or altered from any source distribution.
    69.6  */
    69.7 -#include "SDL_config.h"
    69.8 +#include "../SDL_internal.h"
    69.9  
   69.10  #ifndef _SDL_clipboardevents_c_h
   69.11  #define _SDL_clipboardevents_c_h
    70.1 --- a/src/events/SDL_dropevents.c	Mon Dec 09 13:30:35 2013 -0500
    70.2 +++ b/src/events/SDL_dropevents.c	Sun Nov 24 23:56:17 2013 -0500
    70.3 @@ -18,7 +18,7 @@
    70.4       misrepresented as being the original software.
    70.5    3. This notice may not be removed or altered from any source distribution.
    70.6  */
    70.7 -#include "SDL_config.h"
    70.8 +#include "../SDL_internal.h"
    70.9  
   70.10  /* Drag and drop event handling code for SDL */
   70.11  
    71.1 --- a/src/events/SDL_dropevents_c.h	Mon Dec 09 13:30:35 2013 -0500
    71.2 +++ b/src/events/SDL_dropevents_c.h	Sun Nov 24 23:56:17 2013 -0500
    71.3 @@ -18,7 +18,7 @@
    71.4       misrepresented as being the original software.
    71.5    3. This notice may not be removed or altered from any source distribution.
    71.6  */
    71.7 -#include "SDL_config.h"
    71.8 +#include "../SDL_internal.h"
    71.9  
   71.10  #ifndef _SDL_dropevents_c_h
   71.11  #define _SDL_dropevents_c_h
    72.1 --- a/src/events/SDL_events.c	Mon Dec 09 13:30:35 2013 -0500
    72.2 +++ b/src/events/SDL_events.c	Sun Nov 24 23:56:17 2013 -0500
    72.3 @@ -18,7 +18,7 @@
    72.4       misrepresented as being the original software.
    72.5    3. This notice may not be removed or altered from any source distribution.
    72.6  */
    72.7 -#include "SDL_config.h"
    72.8 +#include "../SDL_internal.h"
    72.9  
   72.10  /* General event handling code for SDL */
   72.11  
    73.1 --- a/src/events/SDL_events_c.h	Mon Dec 09 13:30:35 2013 -0500
    73.2 +++ b/src/events/SDL_events_c.h	Sun Nov 24 23:56:17 2013 -0500
    73.3 @@ -18,7 +18,7 @@
    73.4       misrepresented as being the original software.
    73.5    3. This notice may not be removed or altered from any source distribution.
    73.6  */
    73.7 -#include "SDL_config.h"
    73.8 +#include "../SDL_internal.h"
    73.9  
   73.10  /* Useful functions and variables from SDL_events.c */
   73.11  #include "SDL_events.h"
    74.1 --- a/src/events/SDL_gesture.c	Mon Dec 09 13:30:35 2013 -0500
    74.2 +++ b/src/events/SDL_gesture.c	Sun Nov 24 23:56:17 2013 -0500
    74.3 @@ -19,7 +19,7 @@
    74.4    3. This notice may not be removed or altered from any source distribution.
    74.5  */
    74.6  
    74.7 -#include "SDL_config.h"
    74.8 +#include "../SDL_internal.h"
    74.9  
   74.10  /* General mouse handling code for SDL */
   74.11  
    75.1 --- a/src/events/SDL_gesture_c.h	Mon Dec 09 13:30:35 2013 -0500
    75.2 +++ b/src/events/SDL_gesture_c.h	Sun Nov 24 23:56:17 2013 -0500
    75.3 @@ -18,7 +18,7 @@
    75.4       misrepresented as being the original software.
    75.5    3. This notice may not be removed or altered from any source distribution.
    75.6  */
    75.7 -#include "SDL_config.h"
    75.8 +#include "../SDL_internal.h"
    75.9  
   75.10  #ifndef _SDL_gesture_c_h
   75.11  #define _SDL_gesture_c_h
    76.1 --- a/src/events/SDL_keyboard.c	Mon Dec 09 13:30:35 2013 -0500
    76.2 +++ b/src/events/SDL_keyboard.c	Sun Nov 24 23:56:17 2013 -0500
    76.3 @@ -18,7 +18,7 @@
    76.4       misrepresented as being the original software.
    76.5    3. This notice may not be removed or altered from any source distribution.
    76.6  */
    76.7 -#include "SDL_config.h"
    76.8 +#include "../SDL_internal.h"
    76.9  
   76.10  /* General keyboard handling code for SDL */
   76.11  
    77.1 --- a/src/events/SDL_keyboard_c.h	Mon Dec 09 13:30:35 2013 -0500
    77.2 +++ b/src/events/SDL_keyboard_c.h	Sun Nov 24 23:56:17 2013 -0500
    77.3 @@ -18,7 +18,7 @@
    77.4       misrepresented as being the original software.
    77.5    3. This notice may not be removed or altered from any source distribution.
    77.6  */
    77.7 -#include "SDL_config.h"
    77.8 +#include "../SDL_internal.h"
    77.9  
   77.10  #ifndef _SDL_keyboard_c_h
   77.11  #define _SDL_keyboard_c_h
    78.1 --- a/src/events/SDL_mouse.c	Mon Dec 09 13:30:35 2013 -0500
    78.2 +++ b/src/events/SDL_mouse.c	Sun Nov 24 23:56:17 2013 -0500
    78.3 @@ -18,7 +18,7 @@
    78.4       misrepresented as being the original software.
    78.5    3. This notice may not be removed or altered from any source distribution.
    78.6  */
    78.7 -#include "SDL_config.h"
    78.8 +#include "../SDL_internal.h"
    78.9  
   78.10  /* General mouse handling code for SDL */
   78.11  
    79.1 --- a/src/events/SDL_mouse_c.h	Mon Dec 09 13:30:35 2013 -0500
    79.2 +++ b/src/events/SDL_mouse_c.h	Sun Nov 24 23:56:17 2013 -0500
    79.3 @@ -18,7 +18,7 @@
    79.4       misrepresented as being the original software.
    79.5    3. This notice may not be removed or altered from any source distribution.
    79.6  */
    79.7 -#include "SDL_config.h"
    79.8 +#include "../SDL_internal.h"
    79.9  
   79.10  #ifndef _SDL_mouse_c_h
   79.11  #define _SDL_mouse_c_h
    80.1 --- a/src/events/SDL_quit.c	Mon Dec 09 13:30:35 2013 -0500
    80.2 +++ b/src/events/SDL_quit.c	Sun Nov 24 23:56:17 2013 -0500
    80.3 @@ -18,7 +18,7 @@
    80.4       misrepresented as being the original software.
    80.5    3. This notice may not be removed or altered from any source distribution.
    80.6  */
    80.7 -#include "SDL_config.h"
    80.8 +#include "../SDL_internal.h"
    80.9  
   80.10  /* General quit handling code for SDL */
   80.11  
    81.1 --- a/src/events/SDL_sysevents.h	Mon Dec 09 13:30:35 2013 -0500
    81.2 +++ b/src/events/SDL_sysevents.h	Sun Nov 24 23:56:17 2013 -0500
    81.3 @@ -18,7 +18,7 @@
    81.4       misrepresented as being the original software.
    81.5    3. This notice may not be removed or altered from any source distribution.
    81.6  */
    81.7 -#include "SDL_config.h"
    81.8 +#include "../SDL_internal.h"
    81.9  
   81.10  #include "../video/SDL_sysvideo.h"
   81.11  
    82.1 --- a/src/events/SDL_touch.c	Mon Dec 09 13:30:35 2013 -0500
    82.2 +++ b/src/events/SDL_touch.c	Sun Nov 24 23:56:17 2013 -0500
    82.3 @@ -18,7 +18,7 @@
    82.4       misrepresented as being the original software.
    82.5    3. This notice may not be removed or altered from any source distribution.
    82.6  */
    82.7 -#include "SDL_config.h"
    82.8 +#include "../SDL_internal.h"
    82.9  
   82.10  /* General touch handling code for SDL */
   82.11  
    83.1 --- a/src/events/SDL_touch_c.h	Mon Dec 09 13:30:35 2013 -0500
    83.2 +++ b/src/events/SDL_touch_c.h	Sun Nov 24 23:56:17 2013 -0500
    83.3 @@ -18,7 +18,7 @@
    83.4       misrepresented as being the original software.
    83.5    3. This notice may not be removed or altered from any source distribution.
    83.6  */
    83.7 -#include "SDL_config.h"
    83.8 +#include "../SDL_internal.h"
    83.9  #include "../../include/SDL_touch.h"
   83.10  
   83.11  #ifndef _SDL_touch_c_h
    84.1 --- a/src/events/SDL_windowevents.c	Mon Dec 09 13:30:35 2013 -0500
    84.2 +++ b/src/events/SDL_windowevents.c	Sun Nov 24 23:56:17 2013 -0500
    84.3 @@ -18,7 +18,7 @@
    84.4       misrepresented as being the original software.
    84.5    3. This notice may not be removed or altered from any source distribution.
    84.6  */
    84.7 -#include "SDL_config.h"
    84.8 +#include "../SDL_internal.h"
    84.9  
   84.10  /* Window event handling code for SDL */
   84.11  
    85.1 --- a/src/events/SDL_windowevents_c.h	Mon Dec 09 13:30:35 2013 -0500
    85.2 +++ b/src/events/SDL_windowevents_c.h	Sun Nov 24 23:56:17 2013 -0500
    85.3 @@ -18,7 +18,7 @@
    85.4       misrepresented as being the original software.
    85.5    3. This notice may not be removed or altered from any source distribution.
    85.6  */
    85.7 -#include "SDL_config.h"
    85.8 +#include "../SDL_internal.h"
    85.9  
   85.10  #ifndef _SDL_windowevents_c_h
   85.11  #define _SDL_windowevents_c_h
    86.1 --- a/src/file/SDL_rwops.c	Mon Dec 09 13:30:35 2013 -0500
    86.2 +++ b/src/file/SDL_rwops.c	Sun Nov 24 23:56:17 2013 -0500
    86.3 @@ -20,7 +20,7 @@
    86.4  */
    86.5  /* Need this so Linux systems define fseek64o, ftell64o and off64_t */
    86.6  #define _LARGEFILE64_SOURCE
    86.7 -#include "SDL_config.h"
    86.8 +#include "../SDL_internal.h"
    86.9  
   86.10  #if defined(__WIN32__)
   86.11  #include "../core/windows/SDL_windows.h"
    87.1 --- a/src/filesystem/cocoa/SDL_sysfilesystem.m	Mon Dec 09 13:30:35 2013 -0500
    87.2 +++ b/src/filesystem/cocoa/SDL_sysfilesystem.m	Sun Nov 24 23:56:17 2013 -0500
    87.3 @@ -18,7 +18,7 @@
    87.4       misrepresented as being the original software.
    87.5    3. This notice may not be removed or altered from any source distribution.
    87.6  */
    87.7 -#include "SDL_config.h"
    87.8 +#include "../../SDL_internal.h"
    87.9  
   87.10  #ifdef SDL_FILESYSTEM_COCOA
   87.11  
    88.1 --- a/src/filesystem/dummy/SDL_sysfilesystem.c	Mon Dec 09 13:30:35 2013 -0500
    88.2 +++ b/src/filesystem/dummy/SDL_sysfilesystem.c	Sun Nov 24 23:56:17 2013 -0500
    88.3 @@ -18,7 +18,7 @@
    88.4       misrepresented as being the original software.
    88.5    3. This notice may not be removed or altered from any source distribution.
    88.6  */
    88.7 -#include "SDL_config.h"
    88.8 +#include "../../SDL_internal.h"
    88.9  
   88.10  #ifdef SDL_FILESYSTEM_DUMMY
   88.11  
    89.1 --- a/src/filesystem/haiku/SDL_sysfilesystem.cc	Mon Dec 09 13:30:35 2013 -0500
    89.2 +++ b/src/filesystem/haiku/SDL_sysfilesystem.cc	Sun Nov 24 23:56:17 2013 -0500
    89.3 @@ -18,7 +18,7 @@
    89.4       misrepresented as being the original software.
    89.5    3. This notice may not be removed or altered from any source distribution.
    89.6  */
    89.7 -#include "SDL_config.h"
    89.8 +#include "../../SDL_internal.h"
    89.9  
   89.10  #ifdef SDL_FILESYSTEM_HAIKU
   89.11  
    90.1 --- a/src/filesystem/unix/SDL_sysfilesystem.c	Mon Dec 09 13:30:35 2013 -0500
    90.2 +++ b/src/filesystem/unix/SDL_sysfilesystem.c	Sun Nov 24 23:56:17 2013 -0500
    90.3 @@ -18,7 +18,7 @@
    90.4       misrepresented as being the original software.
    90.5    3. This notice may not be removed or altered from any source distribution.
    90.6  */
    90.7 -#include "SDL_config.h"
    90.8 +#include "../../SDL_internal.h"
    90.9  
   90.10  #ifdef SDL_FILESYSTEM_UNIX
   90.11  
    91.1 --- a/src/filesystem/windows/SDL_sysfilesystem.c	Mon Dec 09 13:30:35 2013 -0500
    91.2 +++ b/src/filesystem/windows/SDL_sysfilesystem.c	Sun Nov 24 23:56:17 2013 -0500
    91.3 @@ -18,7 +18,7 @@
    91.4       misrepresented as being the original software.
    91.5    3. This notice may not be removed or altered from any source distribution.
    91.6  */
    91.7 -#include "SDL_config.h"
    91.8 +#include "../../SDL_internal.h"
    91.9  
   91.10  #ifdef SDL_FILESYSTEM_WINDOWS
   91.11  
    92.1 --- a/src/haptic/SDL_haptic.c	Mon Dec 09 13:30:35 2013 -0500
    92.2 +++ b/src/haptic/SDL_haptic.c	Sun Nov 24 23:56:17 2013 -0500
    92.3 @@ -18,7 +18,7 @@
    92.4       misrepresented as being the original software.
    92.5    3. This notice may not be removed or altered from any source distribution.
    92.6  */
    92.7 -#include "SDL_config.h"
    92.8 +#include "../SDL_internal.h"
    92.9  
   92.10  #include "SDL_syshaptic.h"
   92.11  #include "SDL_haptic_c.h"
    93.1 --- a/src/haptic/SDL_syshaptic.h	Mon Dec 09 13:30:35 2013 -0500
    93.2 +++ b/src/haptic/SDL_syshaptic.h	Sun Nov 24 23:56:17 2013 -0500
    93.3 @@ -19,7 +19,7 @@
    93.4    3. This notice may not be removed or altered from any source distribution.
    93.5  */
    93.6  
    93.7 -#include "SDL_config.h"
    93.8 +#include "../SDL_internal.h"
    93.9  
   93.10  #include "SDL_haptic.h"
   93.11  
    94.1 --- a/src/haptic/darwin/SDL_syshaptic.c	Mon Dec 09 13:30:35 2013 -0500
    94.2 +++ b/src/haptic/darwin/SDL_syshaptic.c	Sun Nov 24 23:56:17 2013 -0500
    94.3 @@ -18,7 +18,7 @@
    94.4       misrepresented as being the original software.
    94.5    3. This notice may not be removed or altered from any source distribution.
    94.6  */
    94.7 -#include "SDL_config.h"
    94.8 +#include "../../SDL_internal.h"
    94.9  
   94.10  #ifdef SDL_HAPTIC_IOKIT
   94.11  
    95.1 --- a/src/haptic/dummy/SDL_syshaptic.c	Mon Dec 09 13:30:35 2013 -0500
    95.2 +++ b/src/haptic/dummy/SDL_syshaptic.c	Sun Nov 24 23:56:17 2013 -0500
    95.3 @@ -18,7 +18,7 @@
    95.4       misrepresented as being the original software.
    95.5    3. This notice may not be removed or altered from any source distribution.
    95.6  */
    95.7 -#include "SDL_config.h"
    95.8 +#include "../../SDL_internal.h"
    95.9  
   95.10  #if defined(SDL_HAPTIC_DUMMY) || defined(SDL_HAPTIC_DISABLED)
   95.11  
    96.1 --- a/src/haptic/linux/SDL_syshaptic.c	Mon Dec 09 13:30:35 2013 -0500
    96.2 +++ b/src/haptic/linux/SDL_syshaptic.c	Sun Nov 24 23:56:17 2013 -0500
    96.3 @@ -18,7 +18,7 @@
    96.4       misrepresented as being the original software.
    96.5    3. This notice may not be removed or altered from any source distribution.
    96.6  */
    96.7 -#include "SDL_config.h"
    96.8 +#include "../../SDL_internal.h"
    96.9  
   96.10  #ifdef SDL_HAPTIC_LINUX
   96.11  
    97.1 --- a/src/haptic/windows/SDL_syshaptic.c	Mon Dec 09 13:30:35 2013 -0500
    97.2 +++ b/src/haptic/windows/SDL_syshaptic.c	Sun Nov 24 23:56:17 2013 -0500
    97.3 @@ -18,7 +18,7 @@
    97.4       misrepresented as being the original software.
    97.5    3. This notice may not be removed or altered from any source distribution.
    97.6  */
    97.7 -#include "SDL_config.h"
    97.8 +#include "../../SDL_internal.h"
    97.9  
   97.10  #ifdef SDL_HAPTIC_DINPUT
   97.11  
    98.1 --- a/src/joystick/SDL_gamecontroller.c	Mon Dec 09 13:30:35 2013 -0500
    98.2 +++ b/src/joystick/SDL_gamecontroller.c	Sun Nov 24 23:56:17 2013 -0500
    98.3 @@ -18,7 +18,7 @@
    98.4       misrepresented as being the original software.
    98.5    3. This notice may not be removed or altered from any source distribution.
    98.6  */
    98.7 -#include "SDL_config.h"
    98.8 +#include "../SDL_internal.h"
    98.9  
   98.10  /* This is the game controller API for Simple DirectMedia Layer */
   98.11  
    99.1 --- a/src/joystick/SDL_gamecontrollerdb.h	Mon Dec 09 13:30:35 2013 -0500
    99.2 +++ b/src/joystick/SDL_gamecontrollerdb.h	Sun Nov 24 23:56:17 2013 -0500
    99.3 @@ -18,7 +18,7 @@
    99.4       misrepresented as being the original software.
    99.5    3. This notice may not be removed or altered from any source distribution.
    99.6  */
    99.7 -#include "SDL_config.h"
    99.8 +#include "../SDL_internal.h"
    99.9  
   99.10  
   99.11  /* Default mappings we support
   100.1 --- a/src/joystick/SDL_joystick.c	Mon Dec 09 13:30:35 2013 -0500
   100.2 +++ b/src/joystick/SDL_joystick.c	Sun Nov 24 23:56:17 2013 -0500
   100.3 @@ -18,7 +18,7 @@
   100.4       misrepresented as being the original software.
   100.5    3. This notice may not be removed or altered from any source distribution.
   100.6  */
   100.7 -#include "SDL_config.h"
   100.8 +#include "../SDL_internal.h"
   100.9  
  100.10  /* This is the joystick API for Simple DirectMedia Layer */
  100.11  
   101.1 --- a/src/joystick/SDL_joystick_c.h	Mon Dec 09 13:30:35 2013 -0500
   101.2 +++ b/src/joystick/SDL_joystick_c.h	Sun Nov 24 23:56:17 2013 -0500
   101.3 @@ -18,7 +18,7 @@
   101.4       misrepresented as being the original software.
   101.5    3. This notice may not be removed or altered from any source distribution.
   101.6  */
   101.7 -#include "SDL_config.h"
   101.8 +#include "../SDL_internal.h"
   101.9  
  101.10  /* Useful functions and variables from SDL_joystick.c */
  101.11  #include "SDL_joystick.h"
   102.1 --- a/src/joystick/SDL_sysjoystick.h	Mon Dec 09 13:30:35 2013 -0500
   102.2 +++ b/src/joystick/SDL_sysjoystick.h	Sun Nov 24 23:56:17 2013 -0500
   102.3 @@ -18,7 +18,7 @@
   102.4       misrepresented as being the original software.
   102.5    3. This notice may not be removed or altered from any source distribution.
   102.6  */
   102.7 -#include "SDL_config.h"
   102.8 +#include "../SDL_internal.h"
   102.9  
  102.10  /* This is the system specific header for the SDL joystick API */
  102.11  
   103.1 --- a/src/joystick/android/SDL_sysjoystick.c	Mon Dec 09 13:30:35 2013 -0500
   103.2 +++ b/src/joystick/android/SDL_sysjoystick.c	Sun Nov 24 23:56:17 2013 -0500
   103.3 @@ -19,7 +19,7 @@
   103.4    3. This notice may not be removed or altered from any source distribution.
   103.5  */
   103.6  
   103.7 -#include "SDL_config.h"
   103.8 +#include "../../SDL_internal.h"
   103.9  
  103.10  #ifdef SDL_JOYSTICK_ANDROID
  103.11  
   104.1 --- a/src/joystick/bsd/SDL_sysjoystick.c	Mon Dec 09 13:30:35 2013 -0500
   104.2 +++ b/src/joystick/bsd/SDL_sysjoystick.c	Sun Nov 24 23:56:17 2013 -0500
   104.3 @@ -18,7 +18,7 @@
   104.4       misrepresented as being the original software.
   104.5    3. This notice may not be removed or altered from any source distribution.
   104.6  */
   104.7 -#include "SDL_config.h"
   104.8 +#include "../../SDL_internal.h"
   104.9  
  104.10  #ifdef SDL_JOYSTICK_USBHID
  104.11  
   105.1 --- a/src/joystick/darwin/SDL_sysjoystick.c	Mon Dec 09 13:30:35 2013 -0500
   105.2 +++ b/src/joystick/darwin/SDL_sysjoystick.c	Sun Nov 24 23:56:17 2013 -0500
   105.3 @@ -18,7 +18,7 @@
   105.4       misrepresented as being the original software.
   105.5    3. This notice may not be removed or altered from any source distribution.
   105.6  */
   105.7 -#include "SDL_config.h"
   105.8 +#include "../../SDL_internal.h"
   105.9  
  105.10  #ifdef SDL_JOYSTICK_IOKIT
  105.11  
   106.1 --- a/src/joystick/darwin/SDL_sysjoystick_c.h	Mon Dec 09 13:30:35 2013 -0500
   106.2 +++ b/src/joystick/darwin/SDL_sysjoystick_c.h	Sun Nov 24 23:56:17 2013 -0500
   106.3 @@ -18,7 +18,7 @@
   106.4       misrepresented as being the original software.
   106.5    3. This notice may not be removed or altered from any source distribution.
   106.6  */
   106.7 -#include "SDL_config.h"
   106.8 +#include "../../SDL_internal.h"
   106.9  
  106.10  #ifndef SDL_JOYSTICK_IOKIT_H
  106.11  
   107.1 --- a/src/joystick/dummy/SDL_sysjoystick.c	Mon Dec 09 13:30:35 2013 -0500
   107.2 +++ b/src/joystick/dummy/SDL_sysjoystick.c	Sun Nov 24 23:56:17 2013 -0500
   107.3 @@ -18,7 +18,7 @@
   107.4       misrepresented as being the original software.
   107.5    3. This notice may not be removed or altered from any source distribution.
   107.6  */
   107.7 -#include "SDL_config.h"
   107.8 +#include "../../SDL_internal.h"
   107.9  
  107.10  #if defined(SDL_JOYSTICK_DUMMY) || defined(SDL_JOYSTICK_DISABLED)
  107.11  
   108.1 --- a/src/joystick/haiku/SDL_haikujoystick.cc	Mon Dec 09 13:30:35 2013 -0500
   108.2 +++ b/src/joystick/haiku/SDL_haikujoystick.cc	Sun Nov 24 23:56:17 2013 -0500
   108.3 @@ -18,7 +18,7 @@
   108.4       misrepresented as being the original software.
   108.5    3. This notice may not be removed or altered from any source distribution.
   108.6  */
   108.7 -#include "SDL_config.h"
   108.8 +#include "../../SDL_internal.h"
   108.9  
  108.10  #ifdef SDL_JOYSTICK_HAIKU
  108.11  
   109.1 --- a/src/joystick/iphoneos/SDL_sysjoystick.m	Mon Dec 09 13:30:35 2013 -0500
   109.2 +++ b/src/joystick/iphoneos/SDL_sysjoystick.m	Sun Nov 24 23:56:17 2013 -0500
   109.3 @@ -18,7 +18,7 @@
   109.4       misrepresented as being the original software.
   109.5    3. This notice may not be removed or altered from any source distribution.
   109.6  */
   109.7 -#include "SDL_config.h"
   109.8 +#include "../../SDL_internal.h"
   109.9  
  109.10  /* This is the system specific header for the SDL joystick API */
  109.11  
   110.1 --- a/src/joystick/linux/SDL_sysjoystick.c	Mon Dec 09 13:30:35 2013 -0500
   110.2 +++ b/src/joystick/linux/SDL_sysjoystick.c	Sun Nov 24 23:56:17 2013 -0500
   110.3 @@ -18,7 +18,7 @@
   110.4       misrepresented as being the original software.
   110.5    3. This notice may not be removed or altered from any source distribution.
   110.6  */
   110.7 -#include "SDL_config.h"
   110.8 +#include "../../SDL_internal.h"
   110.9  
  110.10  #ifdef SDL_JOYSTICK_LINUX
  110.11  
   111.1 --- a/src/joystick/windows/SDL_dxjoystick.c	Mon Dec 09 13:30:35 2013 -0500
   111.2 +++ b/src/joystick/windows/SDL_dxjoystick.c	Sun Nov 24 23:56:17 2013 -0500
   111.3 @@ -18,7 +18,7 @@
   111.4       misrepresented as being the original software.
   111.5    3. This notice may not be removed or altered from any source distribution.
   111.6  */
   111.7 -#include "SDL_config.h"
   111.8 +#include "../../SDL_internal.h"
   111.9  
  111.10  #ifdef SDL_JOYSTICK_DINPUT
  111.11  
   112.1 --- a/src/joystick/windows/SDL_dxjoystick_c.h	Mon Dec 09 13:30:35 2013 -0500
   112.2 +++ b/src/joystick/windows/SDL_dxjoystick_c.h	Sun Nov 24 23:56:17 2013 -0500
   112.3 @@ -18,7 +18,7 @@
   112.4       misrepresented as being the original software.
   112.5    3. This notice may not be removed or altered from any source distribution.
   112.6  */
   112.7 -#include "SDL_config.h"
   112.8 +#include "../../SDL_internal.h"
   112.9  
  112.10  #ifndef SDL_JOYSTICK_DINPUT_H
  112.11  
   113.1 --- a/src/joystick/windows/SDL_mmjoystick.c	Mon Dec 09 13:30:35 2013 -0500
   113.2 +++ b/src/joystick/windows/SDL_mmjoystick.c	Sun Nov 24 23:56:17 2013 -0500
   113.3 @@ -18,7 +18,7 @@
   113.4       misrepresented as being the original software.
   113.5    3. This notice may not be removed or altered from any source distribution.
   113.6  */
   113.7 -#include "SDL_config.h"
   113.8 +#include "../../SDL_internal.h"
   113.9  
  113.10  #ifdef SDL_JOYSTICK_WINMM
  113.11  
   114.1 --- a/src/libm/math_libm.h	Mon Dec 09 13:30:35 2013 -0500
   114.2 +++ b/src/libm/math_libm.h	Sun Nov 24 23:56:17 2013 -0500
   114.3 @@ -18,7 +18,7 @@
   114.4       misrepresented as being the original software.
   114.5    3. This notice may not be removed or altered from any source distribution.
   114.6  */
   114.7 -#include "SDL_config.h"
   114.8 +#include "../SDL_internal.h"
   114.9  
  114.10  /* Math routines from uClibc: http://www.uclibc.org */
  114.11  
   115.1 --- a/src/loadso/dlopen/SDL_sysloadso.c	Mon Dec 09 13:30:35 2013 -0500
   115.2 +++ b/src/loadso/dlopen/SDL_sysloadso.c	Sun Nov 24 23:56:17 2013 -0500
   115.3 @@ -18,7 +18,7 @@
   115.4       misrepresented as being the original software.
   115.5    3. This notice may not be removed or altered from any source distribution.
   115.6  */
   115.7 -#include "SDL_config.h"
   115.8 +#include "../../SDL_internal.h"
   115.9  
  115.10  #ifdef SDL_LOADSO_DLOPEN
  115.11  
   116.1 --- a/src/loadso/dummy/SDL_sysloadso.c	Mon Dec 09 13:30:35 2013 -0500
   116.2 +++ b/src/loadso/dummy/SDL_sysloadso.c	Sun Nov 24 23:56:17 2013 -0500
   116.3 @@ -18,7 +18,7 @@
   116.4       misrepresented as being the original software.
   116.5    3. This notice may not be removed or altered from any source distribution.
   116.6  */
   116.7 -#include "SDL_config.h"
   116.8 +#include "../../SDL_internal.h"
   116.9  
  116.10  #if defined(SDL_LOADSO_DUMMY) || defined(SDL_LOADSO_DISABLED)
  116.11  
   117.1 --- a/src/loadso/haiku/SDL_sysloadso.c	Mon Dec 09 13:30:35 2013 -0500
   117.2 +++ b/src/loadso/haiku/SDL_sysloadso.c	Sun Nov 24 23:56:17 2013 -0500
   117.3 @@ -18,7 +18,7 @@
   117.4       misrepresented as being the original software.
   117.5    3. This notice may not be removed or altered from any source distribution.
   117.6  */
   117.7 -#include "SDL_config.h"
   117.8 +#include "../../SDL_internal.h"
   117.9  
  117.10  #ifdef SDL_LOADSO_HAIKU
  117.11  
   118.1 --- a/src/loadso/windows/SDL_sysloadso.c	Mon Dec 09 13:30:35 2013 -0500
   118.2 +++ b/src/loadso/windows/SDL_sysloadso.c	Sun Nov 24 23:56:17 2013 -0500
   118.3 @@ -18,7 +18,7 @@
   118.4       misrepresented as being the original software.
   118.5    3. This notice may not be removed or altered from any source distribution.
   118.6  */
   118.7 -#include "SDL_config.h"
   118.8 +#include "../../SDL_internal.h"
   118.9  
  118.10  #ifdef SDL_LOADSO_WINDOWS
  118.11  
   119.1 --- a/src/main/android/SDL_android_main.c	Mon Dec 09 13:30:35 2013 -0500
   119.2 +++ b/src/main/android/SDL_android_main.c	Sun Nov 24 23:56:17 2013 -0500
   119.3 @@ -1,5 +1,5 @@
   119.4  
   119.5 -#include "SDL_config.h"
   119.6 +#include "../../SDL_internal.h"
   119.7  
   119.8  #ifdef __ANDROID__
   119.9  
   120.1 --- a/src/main/dummy/SDL_dummy_main.c	Mon Dec 09 13:30:35 2013 -0500
   120.2 +++ b/src/main/dummy/SDL_dummy_main.c	Sun Nov 24 23:56:17 2013 -0500
   120.3 @@ -1,6 +1,6 @@
   120.4  
   120.5  /* Include the SDL main definition header */
   120.6 -#include "SDL_config.h"
   120.7 +#include "../../SDL_internal.h"
   120.8  #include "SDL_main.h"
   120.9  
  120.10  #ifdef main
   121.1 --- a/src/main/haiku/SDL_BApp.h	Mon Dec 09 13:30:35 2013 -0500
   121.2 +++ b/src/main/haiku/SDL_BApp.h	Sun Nov 24 23:56:17 2013 -0500
   121.3 @@ -31,7 +31,7 @@
   121.4  extern "C" {
   121.5  #endif
   121.6  
   121.7 -#include "SDL_config.h"
   121.8 +#include "../../SDL_internal.h"
   121.9  
  121.10  #include "SDL_video.h"
  121.11  
   122.1 --- a/src/main/haiku/SDL_BeApp.cc	Mon Dec 09 13:30:35 2013 -0500
   122.2 +++ b/src/main/haiku/SDL_BeApp.cc	Sun Nov 24 23:56:17 2013 -0500
   122.3 @@ -18,7 +18,7 @@
   122.4       misrepresented as being the original software.
   122.5    3. This notice may not be removed or altered from any source distribution.
   122.6  */
   122.7 -#include "SDL_config.h"
   122.8 +#include "../../SDL_internal.h"
   122.9  
  122.10  #if defined(__HAIKU__)
  122.11  
   123.1 --- a/src/main/haiku/SDL_BeApp.h	Mon Dec 09 13:30:35 2013 -0500
   123.2 +++ b/src/main/haiku/SDL_BeApp.h	Sun Nov 24 23:56:17 2013 -0500
   123.3 @@ -18,7 +18,7 @@
   123.4       misrepresented as being the original software.
   123.5    3. This notice may not be removed or altered from any source distribution.
   123.6  */
   123.7 -#include "SDL_config.h"
   123.8 +#include "../../SDL_internal.h"
   123.9  
  123.10  
  123.11  #ifdef __cplusplus
   124.1 --- a/src/power/SDL_power.c	Mon Dec 09 13:30:35 2013 -0500
   124.2 +++ b/src/power/SDL_power.c	Sun Nov 24 23:56:17 2013 -0500
   124.3 @@ -18,7 +18,7 @@
   124.4       misrepresented as being the original software.
   124.5    3. This notice may not be removed or altered from any source distribution.
   124.6  */
   124.7 -#include "SDL_config.h"
   124.8 +#include "../SDL_internal.h"
   124.9  #include "SDL_power.h"
  124.10  
  124.11  /*
   125.1 --- a/src/power/android/SDL_syspower.c	Mon Dec 09 13:30:35 2013 -0500
   125.2 +++ b/src/power/android/SDL_syspower.c	Sun Nov 24 23:56:17 2013 -0500
   125.3 @@ -18,7 +18,7 @@
   125.4       misrepresented as being the original software.
   125.5    3. This notice may not be removed or altered from any source distribution.
   125.6  */
   125.7 -#include "SDL_config.h"
   125.8 +#include "../../SDL_internal.h"
   125.9  
  125.10  #ifndef SDL_POWER_DISABLED
  125.11  #if SDL_POWER_ANDROID
   126.1 --- a/src/power/haiku/SDL_syspower.c	Mon Dec 09 13:30:35 2013 -0500
   126.2 +++ b/src/power/haiku/SDL_syspower.c	Sun Nov 24 23:56:17 2013 -0500
   126.3 @@ -18,7 +18,7 @@
   126.4       misrepresented as being the original software.
   126.5    3. This notice may not be removed or altered from any source distribution.
   126.6  */
   126.7 -#include "SDL_config.h"
   126.8 +#include "../../SDL_internal.h"
   126.9  
  126.10  /* !!! FIXME: does this thing even work on Haiku? */
  126.11  #ifndef SDL_POWER_DISABLED
   127.1 --- a/src/power/linux/SDL_syspower.c	Mon Dec 09 13:30:35 2013 -0500
   127.2 +++ b/src/power/linux/SDL_syspower.c	Sun Nov 24 23:56:17 2013 -0500
   127.3 @@ -18,7 +18,7 @@
   127.4       misrepresented as being the original software.
   127.5    3. This notice may not be removed or altered from any source distribution.
   127.6  */
   127.7 -#include "SDL_config.h"
   127.8 +#include "../../SDL_internal.h"
   127.9  
  127.10  #ifndef SDL_POWER_DISABLED
  127.11  #if SDL_POWER_LINUX
   128.1 --- a/src/power/macosx/SDL_syspower.c	Mon Dec 09 13:30:35 2013 -0500
   128.2 +++ b/src/power/macosx/SDL_syspower.c	Sun Nov 24 23:56:17 2013 -0500
   128.3 @@ -18,7 +18,7 @@
   128.4       misrepresented as being the original software.
   128.5    3. This notice may not be removed or altered from any source distribution.
   128.6  */
   128.7 -#include "SDL_config.h"
   128.8 +#include "../../SDL_internal.h"
   128.9  
  128.10  #ifndef SDL_POWER_DISABLED
  128.11  #if SDL_POWER_MACOSX
   129.1 --- a/src/power/psp/SDL_syspower.c	Mon Dec 09 13:30:35 2013 -0500
   129.2 +++ b/src/power/psp/SDL_syspower.c	Sun Nov 24 23:56:17 2013 -0500
   129.3 @@ -19,7 +19,7 @@
   129.4    3. This notice may not be removed or altered from any source distribution.
   129.5  */
   129.6  
   129.7 -#include "SDL_config.h"
   129.8 +#include "../../SDL_internal.h"
   129.9  
  129.10  #ifndef SDL_POWER_DISABLED
  129.11  #if SDL_POWER_PSP
   130.1 --- a/src/power/uikit/SDL_syspower.h	Mon Dec 09 13:30:35 2013 -0500
   130.2 +++ b/src/power/uikit/SDL_syspower.h	Sun Nov 24 23:56:17 2013 -0500
   130.3 @@ -18,7 +18,7 @@
   130.4       misrepresented as being the original software.
   130.5    3. This notice may not be removed or altered from any source distribution.
   130.6  */
   130.7 -#include "SDL_config.h"
   130.8 +#include "../../SDL_internal.h"
   130.9  
  130.10  #if SDL_POWER_UIKIT
  130.11  
   131.1 --- a/src/power/uikit/SDL_syspower.m	Mon Dec 09 13:30:35 2013 -0500
   131.2 +++ b/src/power/uikit/SDL_syspower.m	Sun Nov 24 23:56:17 2013 -0500
   131.3 @@ -18,7 +18,7 @@
   131.4       misrepresented as being the original software.
   131.5    3. This notice may not be removed or altered from any source distribution.
   131.6  */
   131.7 -#include "SDL_config.h"
   131.8 +#include "../../SDL_internal.h"
   131.9  
  131.10  #ifndef SDL_POWER_DISABLED
  131.11  #if SDL_POWER_UIKIT
   132.1 --- a/src/power/windows/SDL_syspower.c	Mon Dec 09 13:30:35 2013 -0500
   132.2 +++ b/src/power/windows/SDL_syspower.c	Sun Nov 24 23:56:17 2013 -0500
   132.3 @@ -18,7 +18,7 @@
   132.4       misrepresented as being the original software.
   132.5    3. This notice may not be removed or altered from any source distribution.
   132.6  */
   132.7 -#include "SDL_config.h"
   132.8 +#include "../../SDL_internal.h"
   132.9  
  132.10  #ifndef SDL_POWER_DISABLED
  132.11  #if SDL_POWER_WINDOWS
   133.1 --- a/src/render/SDL_render.c	Mon Dec 09 13:30:35 2013 -0500
   133.2 +++ b/src/render/SDL_render.c	Sun Nov 24 23:56:17 2013 -0500
   133.3 @@ -18,7 +18,7 @@
   133.4       misrepresented as being the original software.
   133.5    3. This notice may not be removed or altered from any source distribution.
   133.6  */
   133.7 -#include "SDL_config.h"
   133.8 +#include "../SDL_internal.h"
   133.9  
  133.10  /* The SDL 2D rendering system */
  133.11  
   134.1 --- a/src/render/SDL_sysrender.h	Mon Dec 09 13:30:35 2013 -0500
   134.2 +++ b/src/render/SDL_sysrender.h	Sun Nov 24 23:56:17 2013 -0500
   134.3 @@ -18,7 +18,7 @@
   134.4       misrepresented as being the original software.
   134.5    3. This notice may not be removed or altered from any source distribution.
   134.6  */
   134.7 -#include "SDL_config.h"
   134.8 +#include "../SDL_internal.h"
   134.9  
  134.10  #ifndef _SDL_sysrender_h
  134.11  #define _SDL_sysrender_h
   135.1 --- a/src/render/SDL_yuv_mmx.c	Mon Dec 09 13:30:35 2013 -0500
   135.2 +++ b/src/render/SDL_yuv_mmx.c	Sun Nov 24 23:56:17 2013 -0500
   135.3 @@ -18,7 +18,7 @@
   135.4       misrepresented as being the original software.
   135.5    3. This notice may not be removed or altered from any source distribution.
   135.6  */
   135.7 -#include "SDL_config.h"
   135.8 +#include "../SDL_internal.h"
   135.9  
  135.10  #if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES
  135.11  
   136.1 --- a/src/render/SDL_yuv_sw.c	Mon Dec 09 13:30:35 2013 -0500
   136.2 +++ b/src/render/SDL_yuv_sw.c	Sun Nov 24 23:56:17 2013 -0500
   136.3 @@ -18,7 +18,7 @@
   136.4       misrepresented as being the original software.
   136.5    3. This notice may not be removed or altered from any source distribution.
   136.6  */
   136.7 -#include "SDL_config.h"
   136.8 +#include "../SDL_internal.h"
   136.9  
  136.10  /* This is the software implementation of the YUV texture support */
  136.11  
   137.1 --- a/src/render/SDL_yuv_sw_c.h	Mon Dec 09 13:30:35 2013 -0500
   137.2 +++ b/src/render/SDL_yuv_sw_c.h	Sun Nov 24 23:56:17 2013 -0500
   137.3 @@ -18,7 +18,7 @@
   137.4       misrepresented as being the original software.
   137.5    3. This notice may not be removed or altered from any source distribution.
   137.6  */
   137.7 -#include "SDL_config.h"
   137.8 +#include "../SDL_internal.h"
   137.9  
  137.10  #include "SDL_video.h"
  137.11  
   138.1 --- a/src/render/direct3d/SDL_render_d3d.c	Mon Dec 09 13:30:35 2013 -0500
   138.2 +++ b/src/render/direct3d/SDL_render_d3d.c	Sun Nov 24 23:56:17 2013 -0500
   138.3 @@ -18,7 +18,7 @@
   138.4       misrepresented as being the original software.
   138.5    3. This notice may not be removed or altered from any source distribution.
   138.6  */
   138.7 -#include "SDL_config.h"
   138.8 +#include "../../SDL_internal.h"
   138.9  
  138.10  #if SDL_VIDEO_RENDER_D3D && !SDL_RENDER_DISABLED
  138.11  
   139.1 --- a/src/render/opengl/SDL_render_gl.c	Mon Dec 09 13:30:35 2013 -0500
   139.2 +++ b/src/render/opengl/SDL_render_gl.c	Sun Nov 24 23:56:17 2013 -0500
   139.3 @@ -18,7 +18,7 @@
   139.4       misrepresented as being the original software.
   139.5    3. This notice may not be removed or altered from any source distribution.
   139.6  */
   139.7 -#include "SDL_config.h"
   139.8 +#include "../../SDL_internal.h"
   139.9  
  139.10  #if SDL_VIDEO_RENDER_OGL && !SDL_RENDER_DISABLED
  139.11  
   140.1 --- a/src/render/opengl/SDL_shaders_gl.c	Mon Dec 09 13:30:35 2013 -0500
   140.2 +++ b/src/render/opengl/SDL_shaders_gl.c	Sun Nov 24 23:56:17 2013 -0500
   140.3 @@ -18,7 +18,7 @@
   140.4       misrepresented as being the original software.
   140.5    3. This notice may not be removed or altered from any source distribution.
   140.6  */
   140.7 -#include "SDL_config.h"
   140.8 +#include "../../SDL_internal.h"
   140.9  
  140.10  #if SDL_VIDEO_RENDER_OGL && !SDL_RENDER_DISABLED
  140.11  
   141.1 --- a/src/render/opengl/SDL_shaders_gl.h	Mon Dec 09 13:30:35 2013 -0500
   141.2 +++ b/src/render/opengl/SDL_shaders_gl.h	Sun Nov 24 23:56:17 2013 -0500
   141.3 @@ -18,7 +18,7 @@
   141.4       misrepresented as being the original software.
   141.5    3. This notice may not be removed or altered from any source distribution.
   141.6  */
   141.7 -#include "SDL_config.h"
   141.8 +#include "../../SDL_internal.h"
   141.9  
  141.10  /* OpenGL shader implementation */
  141.11  
   142.1 --- a/src/render/opengles/SDL_render_gles.c	Mon Dec 09 13:30:35 2013 -0500
   142.2 +++ b/src/render/opengles/SDL_render_gles.c	Sun Nov 24 23:56:17 2013 -0500
   142.3 @@ -18,7 +18,7 @@
   142.4       misrepresented as being the original software.
   142.5    3. This notice may not be removed or altered from any source distribution.
   142.6  */
   142.7 -#include "SDL_config.h"
   142.8 +#include "../../SDL_internal.h"
   142.9  
  142.10  #if SDL_VIDEO_RENDER_OGL_ES && !SDL_RENDER_DISABLED
  142.11  
   143.1 --- a/src/render/opengles2/SDL_render_gles2.c	Mon Dec 09 13:30:35 2013 -0500
   143.2 +++ b/src/render/opengles2/SDL_render_gles2.c	Sun Nov 24 23:56:17 2013 -0500
   143.3 @@ -18,7 +18,7 @@
   143.4       misrepresented as being the original software.
   143.5    3. This notice may not be removed or altered from any source distribution.
   143.6  */
   143.7 -#include "SDL_config.h"
   143.8 +#include "../../SDL_internal.h"
   143.9  
  143.10  #if SDL_VIDEO_RENDER_OGL_ES2 && !SDL_RENDER_DISABLED
  143.11  
   144.1 --- a/src/render/opengles2/SDL_shaders_gles2.c	Mon Dec 09 13:30:35 2013 -0500
   144.2 +++ b/src/render/opengles2/SDL_shaders_gles2.c	Sun Nov 24 23:56:17 2013 -0500
   144.3 @@ -18,7 +18,7 @@
   144.4       misrepresented as being the original software.
   144.5    3. This notice may not be removed or altered from any source distribution.
   144.6  */
   144.7 -#include "SDL_config.h"
   144.8 +#include "../../SDL_internal.h"
   144.9  
  144.10  #if SDL_VIDEO_RENDER_OGL_ES2 && !SDL_RENDER_DISABLED
  144.11  
   145.1 --- a/src/render/opengles2/SDL_shaders_gles2.h	Mon Dec 09 13:30:35 2013 -0500
   145.2 +++ b/src/render/opengles2/SDL_shaders_gles2.h	Sun Nov 24 23:56:17 2013 -0500
   145.3 @@ -18,7 +18,7 @@
   145.4       misrepresented as being the original software.
   145.5    3. This notice may not be removed or altered from any source distribution.
   145.6  */
   145.7 -#include "SDL_config.h"
   145.8 +#include "../../SDL_internal.h"
   145.9  
  145.10  #if SDL_VIDEO_RENDER_OGL_ES2
  145.11  
   146.1 --- a/src/render/psp/SDL_render_psp.c	Mon Dec 09 13:30:35 2013 -0500
   146.2 +++ b/src/render/psp/SDL_render_psp.c	Sun Nov 24 23:56:17 2013 -0500
   146.3 @@ -18,7 +18,7 @@
   146.4       misrepresented as being the original software.
   146.5    3. This notice may not be removed or altered from any source distribution.
   146.6  */
   146.7 -#include "SDL_config.h"
   146.8 +#include "../../SDL_internal.h"
   146.9  
  146.10  #if SDL_VIDEO_RENDER_PSP
  146.11  
   147.1 --- a/src/render/software/SDL_blendfillrect.c	Mon Dec 09 13:30:35 2013 -0500
   147.2 +++ b/src/render/software/SDL_blendfillrect.c	Sun Nov 24 23:56:17 2013 -0500
   147.3 @@ -18,7 +18,7 @@
   147.4       misrepresented as being the original software.
   147.5    3. This notice may not be removed or altered from any source distribution.
   147.6  */
   147.7 -#include "SDL_config.h"
   147.8 +#include "../../SDL_internal.h"
   147.9  
  147.10  #if !SDL_RENDER_DISABLED
  147.11  
   148.1 --- a/src/render/software/SDL_blendfillrect.h	Mon Dec 09 13:30:35 2013 -0500
   148.2 +++ b/src/render/software/SDL_blendfillrect.h	Sun Nov 24 23:56:17 2013 -0500
   148.3 @@ -18,7 +18,7 @@
   148.4       misrepresented as being the original software.
   148.5    3. This notice may not be removed or altered from any source distribution.
   148.6  */
   148.7 -#include "SDL_config.h"
   148.8 +#include "../../SDL_internal.h"
   148.9  
  148.10  
  148.11  extern int SDL_BlendFillRect(SDL_Surface * dst, const SDL_Rect * rect, SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
   149.1 --- a/src/render/software/SDL_blendline.c	Mon Dec 09 13:30:35 2013 -0500
   149.2 +++ b/src/render/software/SDL_blendline.c	Sun Nov 24 23:56:17 2013 -0500
   149.3 @@ -18,7 +18,7 @@
   149.4       misrepresented as being the original software.
   149.5    3. This notice may not be removed or altered from any source distribution.
   149.6  */
   149.7 -#include "SDL_config.h"
   149.8 +#include "../../SDL_internal.h"
   149.9  
  149.10  #if !SDL_RENDER_DISABLED
  149.11  
   150.1 --- a/src/render/software/SDL_blendline.h	Mon Dec 09 13:30:35 2013 -0500
   150.2 +++ b/src/render/software/SDL_blendline.h	Sun Nov 24 23:56:17 2013 -0500
   150.3 @@ -18,7 +18,7 @@
   150.4       misrepresented as being the original software.
   150.5    3. This notice may not be removed or altered from any source distribution.
   150.6  */
   150.7 -#include "SDL_config.h"
   150.8 +#include "../../SDL_internal.h"
   150.9  
  150.10  
  150.11  extern int SDL_BlendLine(SDL_Surface * dst, int x1, int y1, int x2, int y2, SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
   151.1 --- a/src/render/software/SDL_blendpoint.c	Mon Dec 09 13:30:35 2013 -0500
   151.2 +++ b/src/render/software/SDL_blendpoint.c	Sun Nov 24 23:56:17 2013 -0500
   151.3 @@ -18,7 +18,7 @@
   151.4       misrepresented as being the original software.
   151.5    3. This notice may not be removed or altered from any source distribution.
   151.6  */
   151.7 -#include "SDL_config.h"
   151.8 +#include "../../SDL_internal.h"
   151.9  
  151.10  #if !SDL_RENDER_DISABLED
  151.11  
   152.1 --- a/src/render/software/SDL_blendpoint.h	Mon Dec 09 13:30:35 2013 -0500
   152.2 +++ b/src/render/software/SDL_blendpoint.h	Sun Nov 24 23:56:17 2013 -0500
   152.3 @@ -18,7 +18,7 @@
   152.4       misrepresented as being the original software.
   152.5    3. This notice may not be removed or altered from any source distribution.
   152.6  */
   152.7 -#include "SDL_config.h"
   152.8 +#include "../../SDL_internal.h"
   152.9  
  152.10  
  152.11  extern int SDL_BlendPoint(SDL_Surface * dst, int x, int y, SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
   153.1 --- a/src/render/software/SDL_draw.h	Mon Dec 09 13:30:35 2013 -0500
   153.2 +++ b/src/render/software/SDL_draw.h	Sun Nov 24 23:56:17 2013 -0500
   153.3 @@ -18,7 +18,7 @@
   153.4       misrepresented as being the original software.
   153.5    3. This notice may not be removed or altered from any source distribution.
   153.6  */
   153.7 -#include "SDL_config.h"
   153.8 +#include "../../SDL_internal.h"
   153.9  
  153.10  #include "../../video/SDL_blit.h"
  153.11  
   154.1 --- a/src/render/software/SDL_drawline.c	Mon Dec 09 13:30:35 2013 -0500
   154.2 +++ b/src/render/software/SDL_drawline.c	Sun Nov 24 23:56:17 2013 -0500
   154.3 @@ -18,7 +18,7 @@
   154.4       misrepresented as being the original software.
   154.5    3. This notice may not be removed or altered from any source distribution.
   154.6  */
   154.7 -#include "SDL_config.h"
   154.8 +#include "../../SDL_internal.h"
   154.9  
  154.10  #if !SDL_RENDER_DISABLED
  154.11  
   155.1 --- a/src/render/software/SDL_drawline.h	Mon Dec 09 13:30:35 2013 -0500
   155.2 +++ b/src/render/software/SDL_drawline.h	Sun Nov 24 23:56:17 2013 -0500
   155.3 @@ -18,7 +18,7 @@
   155.4       misrepresented as being the original software.
   155.5    3. This notice may not be removed or altered from any source distribution.
   155.6  */
   155.7 -#include "SDL_config.h"
   155.8 +#include "../../SDL_internal.h"
   155.9  
  155.10  
  155.11  extern int SDL_DrawLine(SDL_Surface * dst, int x1, int y1, int x2, int y2, Uint32 color);
   156.1 --- a/src/render/software/SDL_drawpoint.c	Mon Dec 09 13:30:35 2013 -0500
   156.2 +++ b/src/render/software/SDL_drawpoint.c	Sun Nov 24 23:56:17 2013 -0500
   156.3 @@ -18,7 +18,7 @@
   156.4       misrepresented as being the original software.
   156.5    3. This notice may not be removed or altered from any source distribution.
   156.6  */
   156.7 -#include "SDL_config.h"
   156.8 +#include "../../SDL_internal.h"
   156.9  
  156.10  #if !SDL_RENDER_DISABLED
  156.11  
   157.1 --- a/src/render/software/SDL_drawpoint.h	Mon Dec 09 13:30:35 2013 -0500
   157.2 +++ b/src/render/software/SDL_drawpoint.h	Sun Nov 24 23:56:17 2013 -0500
   157.3 @@ -18,7 +18,7 @@
   157.4       misrepresented as being the original software.
   157.5    3. This notice may not be removed or altered from any source distribution.
   157.6  */
   157.7 -#include "SDL_config.h"
   157.8 +#include "../../SDL_internal.h"
   157.9  
  157.10  
  157.11  extern int SDL_DrawPoint(SDL_Surface * dst, int x, int y, Uint32 color);
   158.1 --- a/src/render/software/SDL_render_sw.c	Mon Dec 09 13:30:35 2013 -0500
   158.2 +++ b/src/render/software/SDL_render_sw.c	Sun Nov 24 23:56:17 2013 -0500
   158.3 @@ -18,7 +18,7 @@
   158.4       misrepresented as being the original software.
   158.5    3. This notice may not be removed or altered from any source distribution.
   158.6  */
   158.7 -#include "SDL_config.h"
   158.8 +#include "../../SDL_internal.h"
   158.9  
  158.10  #if !SDL_RENDER_DISABLED
  158.11  
   159.1 --- a/src/render/software/SDL_rotate.c	Mon Dec 09 13:30:35 2013 -0500
   159.2 +++ b/src/render/software/SDL_rotate.c	Sun Nov 24 23:56:17 2013 -0500
   159.3 @@ -28,7 +28,7 @@
   159.4  Andreas Schiffler -- aschiffler at ferzkopp dot net
   159.5  
   159.6  */
   159.7 -#include "SDL_config.h"
   159.8 +#include "../../SDL_internal.h"
   159.9  
  159.10  #if defined(__WIN32__)
  159.11  #include "../../core/windows/SDL_windows.h"
   160.1 --- a/src/stdlib/SDL_getenv.c	Mon Dec 09 13:30:35 2013 -0500
   160.2 +++ b/src/stdlib/SDL_getenv.c	Sun Nov 24 23:56:17 2013 -0500
   160.3 @@ -18,7 +18,7 @@
   160.4       misrepresented as being the original software.
   160.5    3. This notice may not be removed or altered from any source distribution.
   160.6  */
   160.7 -#include "SDL_config.h"
   160.8 +#include "../SDL_internal.h"
   160.9  
  160.10  #if defined(__WIN32__)
  160.11  #include "../core/windows/SDL_windows.h"
   161.1 --- a/src/stdlib/SDL_iconv.c	Mon Dec 09 13:30:35 2013 -0500
   161.2 +++ b/src/stdlib/SDL_iconv.c	Sun Nov 24 23:56:17 2013 -0500
   161.3 @@ -18,7 +18,7 @@
   161.4       misrepresented as being the original software.
   161.5    3. This notice may not be removed or altered from any source distribution.
   161.6  */
   161.7 -#include "SDL_config.h"
   161.8 +#include "../SDL_internal.h"
   161.9  
  161.10  /* This file contains portable iconv functions for SDL */
  161.11  
   162.1 --- a/src/stdlib/SDL_malloc.c	Mon Dec 09 13:30:35 2013 -0500
   162.2 +++ b/src/stdlib/SDL_malloc.c	Sun Nov 24 23:56:17 2013 -0500
   162.3 @@ -18,7 +18,7 @@
   162.4       misrepresented as being the original software.
   162.5    3. This notice may not be removed or altered from any source distribution.
   162.6  */
   162.7 -#include "SDL_config.h"
   162.8 +#include "../SDL_internal.h"
   162.9  
  162.10  /* This file contains portable memory management functions for SDL */
  162.11  
   163.1 --- a/src/stdlib/SDL_qsort.c	Mon Dec 09 13:30:35 2013 -0500
   163.2 +++ b/src/stdlib/SDL_qsort.c	Sun Nov 24 23:56:17 2013 -0500
   163.3 @@ -41,7 +41,7 @@
   163.4   *
   163.5   * Gareth McCaughan   Peterhouse   Cambridge   1998
   163.6   */
   163.7 -#include "SDL_config.h"
   163.8 +#include "../SDL_internal.h"
   163.9  
  163.10  /*
  163.11  #include <assert.h>
   164.1 --- a/src/stdlib/SDL_stdlib.c	Mon Dec 09 13:30:35 2013 -0500
   164.2 +++ b/src/stdlib/SDL_stdlib.c	Sun Nov 24 23:56:17 2013 -0500
   164.3 @@ -18,7 +18,7 @@
   164.4       misrepresented as being the original software.
   164.5    3. This notice may not be removed or altered from any source distribution.
   164.6  */
   164.7 -#include "SDL_config.h"
   164.8 +#include "../SDL_internal.h"
   164.9  
  164.10  /* This file contains portable stdlib functions for SDL */
  164.11  
   165.1 --- a/src/stdlib/SDL_string.c	Mon Dec 09 13:30:35 2013 -0500
   165.2 +++ b/src/stdlib/SDL_string.c	Sun Nov 24 23:56:17 2013 -0500
   165.3 @@ -18,7 +18,7 @@
   165.4       misrepresented as being the original software.
   165.5    3. This notice may not be removed or altered from any source distribution.
   165.6  */
   165.7 -#include "SDL_config.h"
   165.8 +#include "../SDL_internal.h"
   165.9  
  165.10  /* This file contains portable string manipulation functions for SDL */
  165.11  
   166.1 --- a/src/thread/SDL_systhread.h	Mon Dec 09 13:30:35 2013 -0500
   166.2 +++ b/src/thread/SDL_systhread.h	Sun Nov 24 23:56:17 2013 -0500
   166.3 @@ -18,7 +18,7 @@
   166.4       misrepresented as being the original software.
   166.5    3. This notice may not be removed or altered from any source distribution.
   166.6  */
   166.7 -#include "SDL_config.h"
   166.8 +#include "../SDL_internal.h"
   166.9  
  166.10  /* These are functions that need to be implemented by a port of SDL */
  166.11  
   167.1 --- a/src/thread/SDL_thread.c	Mon Dec 09 13:30:35 2013 -0500
   167.2 +++ b/src/thread/SDL_thread.c	Sun Nov 24 23:56:17 2013 -0500
   167.3 @@ -18,7 +18,7 @@
   167.4       misrepresented as being the original software.
   167.5    3. This notice may not be removed or altered from any source distribution.
   167.6  */
   167.7 -#include "SDL_config.h"
   167.8 +#include "../SDL_internal.h"
   167.9  
  167.10  /* System independent thread management routines for SDL */
  167.11  
   168.1 --- a/src/thread/SDL_thread_c.h	Mon Dec 09 13:30:35 2013 -0500
   168.2 +++ b/src/thread/SDL_thread_c.h	Sun Nov 24 23:56:17 2013 -0500
   168.3 @@ -18,7 +18,7 @@
   168.4       misrepresented as being the original software.
   168.5    3. This notice may not be removed or altered from any source distribution.
   168.6  */
   168.7 -#include "SDL_config.h"
   168.8 +#include "../SDL_internal.h"
   168.9  
  168.10  #ifndef _SDL_thread_c_h
  168.11  #define _SDL_thread_c_h
   169.1 --- a/src/thread/generic/SDL_syscond.c	Mon Dec 09 13:30:35 2013 -0500
   169.2 +++ b/src/thread/generic/SDL_syscond.c	Sun Nov 24 23:56:17 2013 -0500
   169.3 @@ -18,7 +18,7 @@
   169.4       misrepresented as being the original software.
   169.5    3. This notice may not be removed or altered from any source distribution.
   169.6  */
   169.7 -#include "SDL_config.h"
   169.8 +#include "../../SDL_internal.h"
   169.9  
  169.10  /* An implementation of condition variables using semaphores and mutexes */
  169.11  /*
   170.1 --- a/src/thread/generic/SDL_sysmutex.c	Mon Dec 09 13:30:35 2013 -0500
   170.2 +++ b/src/thread/generic/SDL_sysmutex.c	Sun Nov 24 23:56:17 2013 -0500
   170.3 @@ -18,7 +18,7 @@
   170.4       misrepresented as being the original software.
   170.5    3. This notice may not be removed or altered from any source distribution.
   170.6  */
   170.7 -#include "SDL_config.h"
   170.8 +#include "../../SDL_internal.h"
   170.9  
  170.10  /* An implementation of mutexes using semaphores */
  170.11  
   171.1 --- a/src/thread/generic/SDL_sysmutex_c.h	Mon Dec 09 13:30:35 2013 -0500
   171.2 +++ b/src/thread/generic/SDL_sysmutex_c.h	Sun Nov 24 23:56:17 2013 -0500
   171.3 @@ -18,5 +18,5 @@
   171.4       misrepresented as being the original software.
   171.5    3. This notice may not be removed or altered from any source distribution.
   171.6  */
   171.7 -#include "SDL_config.h"
   171.8 +#include "../../SDL_internal.h"
   171.9  /* vi: set ts=4 sw=4 expandtab: */
   172.1 --- a/src/thread/generic/SDL_syssem.c	Mon Dec 09 13:30:35 2013 -0500
   172.2 +++ b/src/thread/generic/SDL_syssem.c	Sun Nov 24 23:56:17 2013 -0500
   172.3 @@ -18,7 +18,7 @@
   172.4       misrepresented as being the original software.
   172.5    3. This notice may not be removed or altered from any source distribution.
   172.6  */
   172.7 -#include "SDL_config.h"
   172.8 +#include "../../SDL_internal.h"
   172.9  
  172.10  /* An implementation of semaphores using mutexes and condition variables */
  172.11  
   173.1 --- a/src/thread/generic/SDL_systhread.c	Mon Dec 09 13:30:35 2013 -0500
   173.2 +++ b/src/thread/generic/SDL_systhread.c	Sun Nov 24 23:56:17 2013 -0500
   173.3 @@ -18,7 +18,7 @@
   173.4       misrepresented as being the original software.
   173.5    3. This notice may not be removed or altered from any source distribution.
   173.6  */
   173.7 -#include "SDL_config.h"
   173.8 +#include "../../SDL_internal.h"
   173.9  
  173.10  /* Thread management routines for SDL */
  173.11  
   174.1 --- a/src/thread/generic/SDL_systhread_c.h	Mon Dec 09 13:30:35 2013 -0500
   174.2 +++ b/src/thread/generic/SDL_systhread_c.h	Sun Nov 24 23:56:17 2013 -0500
   174.3 @@ -18,7 +18,7 @@
   174.4       misrepresented as being the original software.
   174.5    3. This notice may not be removed or altered from any source distribution.
   174.6  */
   174.7 -#include "SDL_config.h"
   174.8 +#include "../../SDL_internal.h"
   174.9  
  174.10  /* Stub until we implement threads on this platform */
  174.11  typedef int SYS_ThreadHandle;
   175.1 --- a/src/thread/generic/SDL_systls.c	Mon Dec 09 13:30:35 2013 -0500
   175.2 +++ b/src/thread/generic/SDL_systls.c	Sun Nov 24 23:56:17 2013 -0500
   175.3 @@ -19,7 +19,7 @@
   175.4    3. This notice may not be removed or altered from any source distribution.
   175.5  */
   175.6  
   175.7 -#include "SDL_config.h"
   175.8 +#include "../../SDL_internal.h"
   175.9  #include "../SDL_thread_c.h"
  175.10  
  175.11  
   176.1 --- a/src/thread/psp/SDL_syscond.c	Mon Dec 09 13:30:35 2013 -0500
   176.2 +++ b/src/thread/psp/SDL_syscond.c	Sun Nov 24 23:56:17 2013 -0500
   176.3 @@ -18,7 +18,7 @@
   176.4       misrepresented as being the original software.
   176.5    3. This notice may not be removed or altered from any source distribution.
   176.6  */
   176.7 -#include "SDL_config.h"
   176.8 +#include "../../SDL_internal.h"
   176.9  
  176.10  /* An implementation of condition variables using semaphores and mutexes */
  176.11  /*
   177.1 --- a/src/thread/psp/SDL_sysmutex.c	Mon Dec 09 13:30:35 2013 -0500
   177.2 +++ b/src/thread/psp/SDL_sysmutex.c	Sun Nov 24 23:56:17 2013 -0500
   177.3 @@ -18,7 +18,7 @@
   177.4       misrepresented as being the original software.
   177.5    3. This notice may not be removed or altered from any source distribution.
   177.6  */
   177.7 -#include "SDL_config.h"
   177.8 +#include "../../SDL_internal.h"
   177.9  
  177.10  /* An implementation of mutexes using semaphores */
  177.11  
   178.1 --- a/src/thread/psp/SDL_sysmutex_c.h	Mon Dec 09 13:30:35 2013 -0500
   178.2 +++ b/src/thread/psp/SDL_sysmutex_c.h	Sun Nov 24 23:56:17 2013 -0500
   178.3 @@ -18,5 +18,5 @@
   178.4       misrepresented as being the original software.
   178.5    3. This notice may not be removed or altered from any source distribution.
   178.6  */
   178.7 -#include "SDL_config.h"
   178.8 +#include "../../SDL_internal.h"
   178.9  /* vi: set ts=4 sw=4 expandtab: */
   179.1 --- a/src/thread/pthread/SDL_syscond.c	Mon Dec 09 13:30:35 2013 -0500
   179.2 +++ b/src/thread/pthread/SDL_syscond.c	Sun Nov 24 23:56:17 2013 -0500
   179.3 @@ -18,7 +18,7 @@
   179.4       misrepresented as being the original software.
   179.5    3. This notice may not be removed or altered from any source distribution.
   179.6  */
   179.7 -#include "SDL_config.h"
   179.8 +#include "../../SDL_internal.h"
   179.9  
  179.10  #include <sys/time.h>
  179.11  #include <unistd.h>
   180.1 --- a/src/thread/pthread/SDL_sysmutex.c	Mon Dec 09 13:30:35 2013 -0500
   180.2 +++ b/src/thread/pthread/SDL_sysmutex.c	Sun Nov 24 23:56:17 2013 -0500
   180.3 @@ -18,7 +18,7 @@
   180.4       misrepresented as being the original software.
   180.5    3. This notice may not be removed or altered from any source distribution.
   180.6  */
   180.7 -#include "SDL_config.h"
   180.8 +#include "../../SDL_internal.h"
   180.9  
  180.10  #define _GNU_SOURCE
  180.11  #include <pthread.h>
   181.1 --- a/src/thread/pthread/SDL_sysmutex_c.h	Mon Dec 09 13:30:35 2013 -0500
   181.2 +++ b/src/thread/pthread/SDL_sysmutex_c.h	Sun Nov 24 23:56:17 2013 -0500
   181.3 @@ -18,7 +18,7 @@
   181.4       misrepresented as being the original software.
   181.5    3. This notice may not be removed or altered from any source distribution.
   181.6  */
   181.7 -#include "SDL_config.h"
   181.8 +#include "../../SDL_internal.h"
   181.9  
  181.10  #ifndef _SDL_mutex_c_h
  181.11  #define _SDL_mutex_c_h
   182.1 --- a/src/thread/pthread/SDL_syssem.c	Mon Dec 09 13:30:35 2013 -0500
   182.2 +++ b/src/thread/pthread/SDL_syssem.c	Sun Nov 24 23:56:17 2013 -0500
   182.3 @@ -18,7 +18,7 @@
   182.4       misrepresented as being the original software.
   182.5    3. This notice may not be removed or altered from any source distribution.
   182.6  */
   182.7 -#include "SDL_config.h"
   182.8 +#include "../../SDL_internal.h"
   182.9  
  182.10  #include <errno.h>
  182.11  #include <pthread.h>
   183.1 --- a/src/thread/pthread/SDL_systhread.c	Mon Dec 09 13:30:35 2013 -0500
   183.2 +++ b/src/thread/pthread/SDL_systhread.c	Sun Nov 24 23:56:17 2013 -0500
   183.3 @@ -19,7 +19,7 @@
   183.4    3. This notice may not be removed or altered from any source distribution.
   183.5  */
   183.6  
   183.7 -#include "SDL_config.h"
   183.8 +#include "../../SDL_internal.h"
   183.9  
  183.10  #include <pthread.h>
  183.11  
   184.1 --- a/src/thread/pthread/SDL_systhread_c.h	Mon Dec 09 13:30:35 2013 -0500
   184.2 +++ b/src/thread/pthread/SDL_systhread_c.h	Sun Nov 24 23:56:17 2013 -0500
   184.3 @@ -18,7 +18,7 @@
   184.4       misrepresented as being the original software.
   184.5    3. This notice may not be removed or altered from any source distribution.
   184.6  */
   184.7 -#include "SDL_config.h"
   184.8 +#include "../../SDL_internal.h"
   184.9  
  184.10  #include <pthread.h>
  184.11  
   185.1 --- a/src/thread/pthread/SDL_systls.c	Mon Dec 09 13:30:35 2013 -0500
   185.2 +++ b/src/thread/pthread/SDL_systls.c	Sun Nov 24 23:56:17 2013 -0500
   185.3 @@ -18,7 +18,7 @@
   185.4       misrepresented as being the original software.
   185.5    3. This notice may not be removed or altered from any source distribution.
   185.6  */
   185.7 -#include "SDL_config.h"
   185.8 +#include "../../SDL_internal.h"
   185.9  #include "SDL_thread.h"
  185.10  #include "../SDL_thread_c.h"
  185.11  
   186.1 --- a/src/thread/windows/SDL_sysmutex.c	Mon Dec 09 13:30:35 2013 -0500
   186.2 +++ b/src/thread/windows/SDL_sysmutex.c	Sun Nov 24 23:56:17 2013 -0500
   186.3 @@ -18,7 +18,7 @@
   186.4       misrepresented as being the original software.
   186.5    3. This notice may not be removed or altered from any source distribution.
   186.6  */
   186.7 -#include "SDL_config.h"
   186.8 +#include "../../SDL_internal.h"
   186.9  
  186.10  #if SDL_THREAD_WINDOWS
  186.11  
   187.1 --- a/src/thread/windows/SDL_syssem.c	Mon Dec 09 13:30:35 2013 -0500
   187.2 +++ b/src/thread/windows/SDL_syssem.c	Sun Nov 24 23:56:17 2013 -0500
   187.3 @@ -18,7 +18,7 @@
   187.4       misrepresented as being the original software.
   187.5    3. This notice may not be removed or altered from any source distribution.
   187.6  */
   187.7 -#include "SDL_config.h"
   187.8 +#include "../../SDL_internal.h"
   187.9  
  187.10  #if SDL_THREAD_WINDOWS
  187.11  
   188.1 --- a/src/thread/windows/SDL_systhread.c	Mon Dec 09 13:30:35 2013 -0500
   188.2 +++ b/src/thread/windows/SDL_systhread.c	Sun Nov 24 23:56:17 2013 -0500
   188.3 @@ -18,7 +18,7 @@
   188.4       misrepresented as being the original software.
   188.5    3. This notice may not be removed or altered from any source distribution.
   188.6  */
   188.7 -#include "SDL_config.h"
   188.8 +#include "../../SDL_internal.h"
   188.9  
  188.10  #if SDL_THREAD_WINDOWS
  188.11  
   189.1 --- a/src/thread/windows/SDL_systhread_c.h	Mon Dec 09 13:30:35 2013 -0500
   189.2 +++ b/src/thread/windows/SDL_systhread_c.h	Sun Nov 24 23:56:17 2013 -0500
   189.3 @@ -18,7 +18,7 @@
   189.4       misrepresented as being the original software.
   189.5    3. This notice may not be removed or altered from any source distribution.
   189.6  */
   189.7 -#include "SDL_config.h"
   189.8 +#include "../../SDL_internal.h"
   189.9  
  189.10  #ifndef _SDL_systhread_c_h
  189.11  #define _SDL_systhread_c_h
   190.1 --- a/src/thread/windows/SDL_systls.c	Mon Dec 09 13:30:35 2013 -0500
   190.2 +++ b/src/thread/windows/SDL_systls.c	Sun Nov 24 23:56:17 2013 -0500
   190.3 @@ -19,7 +19,7 @@
   190.4    3. This notice may not be removed or altered from any source distribution.
   190.5  */
   190.6  
   190.7 -#include "SDL_config.h"
   190.8 +#include "../../SDL_internal.h"
   190.9  
  190.10  #if SDL_THREAD_WINDOWS
  190.11  
   191.1 --- a/src/timer/SDL_timer.c	Mon Dec 09 13:30:35 2013 -0500
   191.2 +++ b/src/timer/SDL_timer.c	Sun Nov 24 23:56:17 2013 -0500
   191.3 @@ -18,7 +18,7 @@
   191.4       misrepresented as being the original software.
   191.5    3. This notice may not be removed or altered from any source distribution.
   191.6  */
   191.7 -#include "SDL_config.h"
   191.8 +#include "../SDL_internal.h"
   191.9  
  191.10  #include "SDL_timer.h"
  191.11  #include "SDL_timer_c.h"
   192.1 --- a/src/timer/SDL_timer_c.h	Mon Dec 09 13:30:35 2013 -0500
   192.2 +++ b/src/timer/SDL_timer_c.h	Sun Nov 24 23:56:17 2013 -0500
   192.3 @@ -18,7 +18,7 @@
   192.4       misrepresented as being the original software.
   192.5    3. This notice may not be removed or altered from any source distribution.
   192.6  */
   192.7 -#include "SDL_config.h"
   192.8 +#include "../SDL_internal.h"
   192.9  
  192.10  /* Useful functions and variables from SDL_timer.c */
  192.11  #include "SDL_timer.h"
   193.1 --- a/src/timer/dummy/SDL_systimer.c	Mon Dec 09 13:30:35 2013 -0500
   193.2 +++ b/src/timer/dummy/SDL_systimer.c	Sun Nov 24 23:56:17 2013 -0500
   193.3 @@ -18,7 +18,7 @@
   193.4       misrepresented as being the original software.
   193.5    3. This notice may not be removed or altered from any source distribution.
   193.6  */
   193.7 -#include "SDL_config.h"
   193.8 +#include "../../SDL_internal.h"
   193.9  
  193.10  #if defined(SDL_TIMER_DUMMY) || defined(SDL_TIMERS_DISABLED)
  193.11  
   194.1 --- a/src/timer/haiku/SDL_systimer.c	Mon Dec 09 13:30:35 2013 -0500
   194.2 +++ b/src/timer/haiku/SDL_systimer.c	Sun Nov 24 23:56:17 2013 -0500
   194.3 @@ -18,7 +18,7 @@
   194.4       misrepresented as being the original software.
   194.5    3. This notice may not be removed or altered from any source distribution.
   194.6  */
   194.7 -#include "SDL_config.h"
   194.8 +#include "../../SDL_internal.h"
   194.9  
  194.10  #ifdef SDL_TIMER_HAIKU
  194.11  
   195.1 --- a/src/timer/unix/SDL_systimer.c	Mon Dec 09 13:30:35 2013 -0500
   195.2 +++ b/src/timer/unix/SDL_systimer.c	Sun Nov 24 23:56:17 2013 -0500
   195.3 @@ -18,7 +18,7 @@
   195.4       misrepresented as being the original software.
   195.5    3. This notice may not be removed or altered from any source distribution.
   195.6  */
   195.7 -#include "SDL_config.h"
   195.8 +#include "../../SDL_internal.h"
   195.9  
  195.10  #ifdef SDL_TIMER_UNIX
  195.11  
   196.1 --- a/src/timer/windows/SDL_systimer.c	Mon Dec 09 13:30:35 2013 -0500
   196.2 +++ b/src/timer/windows/SDL_systimer.c	Sun Nov 24 23:56:17 2013 -0500
   196.3 @@ -18,7 +18,7 @@
   196.4       misrepresented as being the original software.
   196.5    3. This notice may not be removed or altered from any source distribution.
   196.6  */
   196.7 -#include "SDL_config.h"
   196.8 +#include "../../SDL_internal.h"
   196.9  
  196.10  #ifdef SDL_TIMER_WINDOWS
  196.11  
   197.1 --- a/src/video/SDL_RLEaccel.c	Mon Dec 09 13:30:35 2013 -0500
   197.2 +++ b/src/video/SDL_RLEaccel.c	Sun Nov 24 23:56:17 2013 -0500
   197.3 @@ -18,7 +18,7 @@
   197.4       misrepresented as being the original software.
   197.5    3. This notice may not be removed or altered from any source distribution.
   197.6  */
   197.7 -#include "SDL_config.h"
   197.8 +#include "../SDL_internal.h"
   197.9  
  197.10  /*
  197.11   * RLE encoding for software colorkey and alpha-channel acceleration
   198.1 --- a/src/video/SDL_RLEaccel_c.h	Mon Dec 09 13:30:35 2013 -0500
   198.2 +++ b/src/video/SDL_RLEaccel_c.h	Sun Nov 24 23:56:17 2013 -0500
   198.3 @@ -18,7 +18,7 @@
   198.4       misrepresented as being the original software.
   198.5    3. This notice may not be removed or altered from any source distribution.
   198.6  */
   198.7 -#include "SDL_config.h"
   198.8 +#include "../SDL_internal.h"
   198.9  
  198.10  /* Useful functions and variables from SDL_RLEaccel.c */
  198.11  
   199.1 --- a/src/video/SDL_blit.c	Mon Dec 09 13:30:35 2013 -0500
   199.2 +++ b/src/video/SDL_blit.c	Sun Nov 24 23:56:17 2013 -0500
   199.3 @@ -18,7 +18,7 @@
   199.4       misrepresented as being the original software.
   199.5    3. This notice may not be removed or altered from any source distribution.
   199.6  */
   199.7 -#include "SDL_config.h"
   199.8 +#include "../SDL_internal.h"
   199.9  
  199.10  #include "SDL_video.h"
  199.11  #include "SDL_sysvideo.h"
   200.1 --- a/src/video/SDL_blit.h	Mon Dec 09 13:30:35 2013 -0500
   200.2 +++ b/src/video/SDL_blit.h	Sun Nov 24 23:56:17 2013 -0500
   200.3 @@ -18,7 +18,7 @@
   200.4       misrepresented as being the original software.
   200.5    3. This notice may not be removed or altered from any source distribution.
   200.6  */
   200.7 -#include "SDL_config.h"
   200.8 +#include "../SDL_internal.h"
   200.9  
  200.10  #ifndef _SDL_blit_h
  200.11  #define _SDL_blit_h
   201.1 --- a/src/video/SDL_blit_0.c	Mon Dec 09 13:30:35 2013 -0500
   201.2 +++ b/src/video/SDL_blit_0.c	Sun Nov 24 23:56:17 2013 -0500
   201.3 @@ -18,7 +18,7 @@
   201.4       misrepresented as being the original software.
   201.5    3. This notice may not be removed or altered from any source distribution.
   201.6  */
   201.7 -#include "SDL_config.h"
   201.8 +#include "../SDL_internal.h"
   201.9  
  201.10  #include "SDL_video.h"
  201.11  #include "SDL_blit.h"
   202.1 --- a/src/video/SDL_blit_1.c	Mon Dec 09 13:30:35 2013 -0500
   202.2 +++ b/src/video/SDL_blit_1.c	Sun Nov 24 23:56:17 2013 -0500
   202.3 @@ -18,7 +18,7 @@
   202.4       misrepresented as being the original software.
   202.5    3. This notice may not be removed or altered from any source distribution.
   202.6  */
   202.7 -#include "SDL_config.h"
   202.8 +#include "../SDL_internal.h"
   202.9  
  202.10  #include "SDL_video.h"
  202.11  #include "SDL_blit.h"
   203.1 --- a/src/video/SDL_blit_A.c	Mon Dec 09 13:30:35 2013 -0500
   203.2 +++ b/src/video/SDL_blit_A.c	Sun Nov 24 23:56:17 2013 -0500
   203.3 @@ -18,7 +18,7 @@
   203.4       misrepresented as being the original software.
   203.5    3. This notice may not be removed or altered from any source distribution.
   203.6  */
   203.7 -#include "SDL_config.h"
   203.8 +#include "../SDL_internal.h"
   203.9  
  203.10  #include "SDL_video.h"
  203.11  #include "SDL_blit.h"
   204.1 --- a/src/video/SDL_blit_N.c	Mon Dec 09 13:30:35 2013 -0500
   204.2 +++ b/src/video/SDL_blit_N.c	Sun Nov 24 23:56:17 2013 -0500
   204.3 @@ -18,7 +18,7 @@
   204.4       misrepresented as being the original software.
   204.5    3. This notice may not be removed or altered from any source distribution.
   204.6  */
   204.7 -#include "SDL_config.h"
   204.8 +#include "../SDL_internal.h"
   204.9  
  204.10  #include "SDL_video.h"
  204.11  #include "SDL_endian.h"
   205.1 --- a/src/video/SDL_blit_auto.c	Mon Dec 09 13:30:35 2013 -0500
   205.2 +++ b/src/video/SDL_blit_auto.c	Sun Nov 24 23:56:17 2013 -0500
   205.3 @@ -19,7 +19,7 @@
   205.4       misrepresented as being the original software.
   205.5    3. This notice may not be removed or altered from any source distribution.
   205.6  */
   205.7 -#include "SDL_config.h"
   205.8 +#include "../SDL_internal.h"
   205.9  
  205.10  /* *INDENT-OFF* */
  205.11  
   206.1 --- a/src/video/SDL_blit_auto.h	Mon Dec 09 13:30:35 2013 -0500
   206.2 +++ b/src/video/SDL_blit_auto.h	Sun Nov 24 23:56:17 2013 -0500
   206.3 @@ -19,7 +19,7 @@
   206.4       misrepresented as being the original software.
   206.5    3. This notice may not be removed or altered from any source distribution.
   206.6  */
   206.7 -#include "SDL_config.h"
   206.8 +#include "../SDL_internal.h"
   206.9  
  206.10  /* *INDENT-OFF* */
  206.11  
   207.1 --- a/src/video/SDL_blit_copy.c	Mon Dec 09 13:30:35 2013 -0500
   207.2 +++ b/src/video/SDL_blit_copy.c	Sun Nov 24 23:56:17 2013 -0500
   207.3 @@ -18,7 +18,7 @@
   207.4       misrepresented as being the original software.
   207.5    3. This notice may not be removed or altered from any source distribution.
   207.6  */
   207.7 -#include "SDL_config.h"
   207.8 +#include "../SDL_internal.h"
   207.9  
  207.10  #include "SDL_video.h"
  207.11  #include "SDL_blit.h"
   208.1 --- a/src/video/SDL_blit_slow.c	Mon Dec 09 13:30:35 2013 -0500
   208.2 +++ b/src/video/SDL_blit_slow.c	Sun Nov 24 23:56:17 2013 -0500
   208.3 @@ -18,7 +18,7 @@
   208.4       misrepresented as being the original software.
   208.5    3. This notice may not be removed or altered from any source distribution.
   208.6  */
   208.7 -#include "SDL_config.h"
   208.8 +#include "../SDL_internal.h"
   208.9  
  208.10  #include "SDL_video.h"
  208.11  #include "SDL_blit.h"
   209.1 --- a/src/video/SDL_blit_slow.h	Mon Dec 09 13:30:35 2013 -0500
   209.2 +++ b/src/video/SDL_blit_slow.h	Sun Nov 24 23:56:17 2013 -0500
   209.3 @@ -18,7 +18,7 @@
   209.4       misrepresented as being the original software.
   209.5    3. This notice may not be removed or altered from any source distribution.
   209.6  */
   209.7 -#include "SDL_config.h"
   209.8 +#include "../SDL_internal.h"
   209.9  
  209.10  extern void SDL_Blit_Slow(SDL_BlitInfo * info);
  209.11  
   210.1 --- a/src/video/SDL_bmp.c	Mon Dec 09 13:30:35 2013 -0500
   210.2 +++ b/src/video/SDL_bmp.c	Sun Nov 24 23:56:17 2013 -0500
   210.3 @@ -18,7 +18,7 @@
   210.4       misrepresented as being the original software.
   210.5    3. This notice may not be removed or altered from any source distribution.
   210.6  */
   210.7 -#include "SDL_config.h"
   210.8 +#include "../SDL_internal.h"
   210.9  
  210.10  /*
  210.11     Code to load and save surfaces in Windows BMP format.
   211.1 --- a/src/video/SDL_clipboard.c	Mon Dec 09 13:30:35 2013 -0500
   211.2 +++ b/src/video/SDL_clipboard.c	Sun Nov 24 23:56:17 2013 -0500
   211.3 @@ -18,7 +18,7 @@
   211.4       misrepresented as being the original software.
   211.5    3. This notice may not be removed or altered from any source distribution.
   211.6  */
   211.7 -#include "SDL_config.h"
   211.8 +#include "../SDL_internal.h"
   211.9  
  211.10  #include "SDL_clipboard.h"
  211.11  #include "SDL_sysvideo.h"
   212.1 --- a/src/video/SDL_egl.c	Mon Dec 09 13:30:35 2013 -0500
   212.2 +++ b/src/video/SDL_egl.c	Sun Nov 24 23:56:17 2013 -0500
   212.3 @@ -18,7 +18,7 @@
   212.4   *     misrepresented as being the original software.
   212.5   *  3. This notice may not be removed or altered from any source distribution.
   212.6   */
   212.7 -#include "SDL_config.h"
   212.8 +#include "../SDL_internal.h"
   212.9  
  212.10  #if SDL_VIDEO_OPENGL_EGL
  212.11  
   213.1 --- a/src/video/SDL_egl_c.h	Mon Dec 09 13:30:35 2013 -0500
   213.2 +++ b/src/video/SDL_egl_c.h	Sun Nov 24 23:56:17 2013 -0500
   213.3 @@ -18,7 +18,7 @@
   213.4       misrepresented as being the original software.
   213.5    3. This notice may not be removed or altered from any source distribution.
   213.6  */
   213.7 -#include "SDL_config.h"
   213.8 +#include "../SDL_internal.h"
   213.9  
  213.10  #ifndef _SDL_egl_h
  213.11  #define _SDL_egl_h
   214.1 --- a/src/video/SDL_fillrect.c	Mon Dec 09 13:30:35 2013 -0500
   214.2 +++ b/src/video/SDL_fillrect.c	Sun Nov 24 23:56:17 2013 -0500
   214.3 @@ -18,7 +18,7 @@
   214.4       misrepresented as being the original software.
   214.5    3. This notice may not be removed or altered from any source distribution.
   214.6  */
   214.7 -#include "SDL_config.h"
   214.8 +#include "../SDL_internal.h"
   214.9  
  214.10  #include "SDL_video.h"
  214.11  #include "SDL_blit.h"
   215.1 --- a/src/video/SDL_pixels.c	Mon Dec 09 13:30:35 2013 -0500
   215.2 +++ b/src/video/SDL_pixels.c	Sun Nov 24 23:56:17 2013 -0500
   215.3 @@ -18,7 +18,7 @@
   215.4       misrepresented as being the original software.
   215.5    3. This notice may not be removed or altered from any source distribution.
   215.6  */
   215.7 -#include "SDL_config.h"
   215.8 +#include "../SDL_internal.h"
   215.9  
  215.10  /* General (mostly internal) pixel/color manipulation routines for SDL */
  215.11  
   216.1 --- a/src/video/SDL_pixels_c.h	Mon Dec 09 13:30:35 2013 -0500
   216.2 +++ b/src/video/SDL_pixels_c.h	Sun Nov 24 23:56:17 2013 -0500
   216.3 @@ -18,7 +18,7 @@
   216.4       misrepresented as being the original software.
   216.5    3. This notice may not be removed or altered from any source distribution.
   216.6  */
   216.7 -#include "SDL_config.h"
   216.8 +#include "../SDL_internal.h"
   216.9  
  216.10  /* Useful functions and variables from SDL_pixel.c */
  216.11  
   217.1 --- a/src/video/SDL_rect.c	Mon Dec 09 13:30:35 2013 -0500
   217.2 +++ b/src/video/SDL_rect.c	Sun Nov 24 23:56:17 2013 -0500
   217.3 @@ -18,7 +18,7 @@
   217.4       misrepresented as being the original software.
   217.5    3. This notice may not be removed or altered from any source distribution.
   217.6  */
   217.7 -#include "SDL_config.h"
   217.8 +#include "../SDL_internal.h"
   217.9  
  217.10  #include "SDL_rect.h"
  217.11  #include "SDL_rect_c.h"
   218.1 --- a/src/video/SDL_rect_c.h	Mon Dec 09 13:30:35 2013 -0500
   218.2 +++ b/src/video/SDL_rect_c.h	Sun Nov 24 23:56:17 2013 -0500
   218.3 @@ -18,7 +18,7 @@
   218.4       misrepresented as being the original software.
   218.5    3. This notice may not be removed or altered from any source distribution.
   218.6  */
   218.7 -#include "SDL_config.h"
   218.8 +#include "../SDL_internal.h"
   218.9  
  218.10  extern SDL_bool SDL_GetSpanEnclosingRect(int width, int height, int numrects, const SDL_Rect * rects, SDL_Rect *span);
  218.11  
   219.1 --- a/src/video/SDL_shape.c	Mon Dec 09 13:30:35 2013 -0500
   219.2 +++ b/src/video/SDL_shape.c	Sun Nov 24 23:56:17 2013 -0500
   219.3 @@ -18,7 +18,7 @@
   219.4       misrepresented as being the original software.
   219.5    3. This notice may not be removed or altered from any source distribution.
   219.6  */
   219.7 -#include "SDL_config.h"
   219.8 +#include "../SDL_internal.h"
   219.9  
  219.10  #include "SDL.h"
  219.11  #include "SDL_assert.h"
   220.1 --- a/src/video/SDL_shape_internals.h	Mon Dec 09 13:30:35 2013 -0500
   220.2 +++ b/src/video/SDL_shape_internals.h	Sun Nov 24 23:56:17 2013 -0500
   220.3 @@ -18,7 +18,7 @@
   220.4       misrepresented as being the original software.
   220.5    3. This notice may not be removed or altered from any source distribution.
   220.6  */
   220.7 -#include "SDL_config.h"
   220.8 +#include "../SDL_internal.h"
   220.9  
  220.10  #ifndef _SDL_shape_internals_h
  220.11  #define _SDL_shape_internals_h
   221.1 --- a/src/video/SDL_stretch.c	Mon Dec 09 13:30:35 2013 -0500
   221.2 +++ b/src/video/SDL_stretch.c	Sun Nov 24 23:56:17 2013 -0500
   221.3 @@ -18,7 +18,7 @@
   221.4       misrepresented as being the original software.
   221.5    3. This notice may not be removed or altered from any source distribution.
   221.6  */
   221.7 -#include "SDL_config.h"
   221.8 +#include "../SDL_internal.h"
   221.9  
  221.10  /* This a stretch blit implementation based on ideas given to me by
  221.11     Tomasz Cejner - thanks! :)
   222.1 --- a/src/video/SDL_surface.c	Mon Dec 09 13:30:35 2013 -0500
   222.2 +++ b/src/video/SDL_surface.c	Sun Nov 24 23:56:17 2013 -0500
   222.3 @@ -18,7 +18,7 @@
   222.4       misrepresented as being the original software.
   222.5    3. This notice may not be removed or altered from any source distribution.
   222.6  */
   222.7 -#include "SDL_config.h"
   222.8 +#include "../SDL_internal.h"
   222.9  
  222.10  #include "SDL_video.h"
  222.11  #include "SDL_sysvideo.h"
   223.1 --- a/src/video/SDL_sysvideo.h	Mon Dec 09 13:30:35 2013 -0500
   223.2 +++ b/src/video/SDL_sysvideo.h	Sun Nov 24 23:56:17 2013 -0500
   223.3 @@ -18,7 +18,7 @@
   223.4       misrepresented as being the original software.
   223.5    3. This notice may not be removed or altered from any source distribution.
   223.6  */
   223.7 -#include "SDL_config.h"
   223.8 +#include "../SDL_internal.h"
   223.9  
  223.10  #ifndef _SDL_sysvideo_h
  223.11  #define _SDL_sysvideo_h
   224.1 --- a/src/video/SDL_video.c	Mon Dec 09 13:30:35 2013 -0500
   224.2 +++ b/src/video/SDL_video.c	Sun Nov 24 23:56:17 2013 -0500
   224.3 @@ -18,7 +18,7 @@
   224.4       misrepresented as being the original software.
   224.5    3. This notice may not be removed or altered from any source distribution.
   224.6  */
   224.7 -#include "SDL_config.h"
   224.8 +#include "../SDL_internal.h"
   224.9  
  224.10  /* The high-level video driver subsystem */
  224.11  
   225.1 --- a/src/video/android/SDL_androidclipboard.c	Mon Dec 09 13:30:35 2013 -0500
   225.2 +++ b/src/video/android/SDL_androidclipboard.c	Sun Nov 24 23:56:17 2013 -0500
   225.3 @@ -18,7 +18,7 @@
   225.4       misrepresented as being the original software.
   225.5    3. This notice may not be removed or altered from any source distribution.
   225.6  */
   225.7 -#include "SDL_config.h"
   225.8 +#include "../../SDL_internal.h"
   225.9  
  225.10  #if SDL_VIDEO_DRIVER_ANDROID
  225.11  
   226.1 --- a/src/video/android/SDL_androidclipboard.h	Mon Dec 09 13:30:35 2013 -0500
   226.2 +++ b/src/video/android/SDL_androidclipboard.h	Sun Nov 24 23:56:17 2013 -0500
   226.3 @@ -18,7 +18,7 @@
   226.4       misrepresented as being the original software.
   226.5    3. This notice may not be removed or altered from any source distribution.
   226.6  */
   226.7 -#include "SDL_config.h"
   226.8 +#include "../../SDL_internal.h"
   226.9  
  226.10  #ifndef _SDL_androidclipboard_h
  226.11  #define _SDL_androidclipboard_h
   227.1 --- a/src/video/android/SDL_androidevents.c	Mon Dec 09 13:30:35 2013 -0500
   227.2 +++ b/src/video/android/SDL_androidevents.c	Sun Nov 24 23:56:17 2013 -0500
   227.3 @@ -18,7 +18,7 @@
   227.4       misrepresented as being the original software.
   227.5    3. This notice may not be removed or altered from any source distribution.
   227.6  */
   227.7 -#include "SDL_config.h"
   227.8 +#include "../../SDL_internal.h"
   227.9  
  227.10  #if SDL_VIDEO_DRIVER_ANDROID
  227.11  
   228.1 --- a/src/video/android/SDL_androidevents.h	Mon Dec 09 13:30:35 2013 -0500
   228.2 +++ b/src/video/android/SDL_androidevents.h	Sun Nov 24 23:56:17 2013 -0500
   228.3 @@ -18,7 +18,7 @@
   228.4       misrepresented as being the original software.
   228.5    3. This notice may not be removed or altered from any source distribution.
   228.6  */
   228.7 -#include "SDL_config.h"
   228.8 +#include "../../SDL_internal.h"
   228.9  
  228.10  #include "SDL_androidvideo.h"
  228.11  
   229.1 --- a/src/video/android/SDL_androidgl.c	Mon Dec 09 13:30:35 2013 -0500
   229.2 +++ b/src/video/android/SDL_androidgl.c	Sun Nov 24 23:56:17 2013 -0500
   229.3 @@ -18,7 +18,7 @@
   229.4       misrepresented as being the original software.
   229.5    3. This notice may not be removed or altered from any source distribution.
   229.6  */
   229.7 -#include "SDL_config.h"
   229.8 +#include "../../SDL_internal.h"
   229.9  
  229.10  #if SDL_VIDEO_DRIVER_ANDROID
  229.11  
   230.1 --- a/src/video/android/SDL_androidkeyboard.c	Mon Dec 09 13:30:35 2013 -0500
   230.2 +++ b/src/video/android/SDL_androidkeyboard.c	Sun Nov 24 23:56:17 2013 -0500
   230.3 @@ -18,7 +18,7 @@
   230.4       misrepresented as being the original software.
   230.5    3. This notice may not be removed or altered from any source distribution.
   230.6  */
   230.7 -#include "SDL_config.h"
   230.8 +#include "../../SDL_internal.h"
   230.9  
  230.10  #if SDL_VIDEO_DRIVER_ANDROID
  230.11  
   231.1 --- a/src/video/android/SDL_androidkeyboard.h	Mon Dec 09 13:30:35 2013 -0500
   231.2 +++ b/src/video/android/SDL_androidkeyboard.h	Sun Nov 24 23:56:17 2013 -0500
   231.3 @@ -18,7 +18,7 @@
   231.4       misrepresented as being the original software.
   231.5    3. This notice may not be removed or altered from any source distribution.
   231.6  */
   231.7 -#include "SDL_config.h"
   231.8 +#include "../../SDL_internal.h"
   231.9  
  231.10  #include "SDL_androidvideo.h"
  231.11  
   232.1 --- a/src/video/android/SDL_androidtouch.c	Mon Dec 09 13:30:35 2013 -0500
   232.2 +++ b/src/video/android/SDL_androidtouch.c	Sun Nov 24 23:56:17 2013 -0500
   232.3 @@ -18,7 +18,7 @@
   232.4       misrepresented as being the original software.
   232.5    3. This notice may not be removed or altered from any source distribution.
   232.6  */
   232.7 -#include "SDL_config.h"
   232.8 +#include "../../SDL_internal.h"
   232.9  
  232.10  #if SDL_VIDEO_DRIVER_ANDROID
  232.11  
   233.1 --- a/src/video/android/SDL_androidtouch.h	Mon Dec 09 13:30:35 2013 -0500
   233.2 +++ b/src/video/android/SDL_androidtouch.h	Sun Nov 24 23:56:17 2013 -0500
   233.3 @@ -18,7 +18,7 @@
   233.4       misrepresented as being the original software.
   233.5    3. This notice may not be removed or altered from any source distribution.
   233.6  */
   233.7 -#include "SDL_config.h"
   233.8 +#include "../../SDL_internal.h"
   233.9  
  233.10  #include "SDL_androidvideo.h"
  233.11  
   234.1 --- a/src/video/android/SDL_androidvideo.c	Mon Dec 09 13:30:35 2013 -0500
   234.2 +++ b/src/video/android/SDL_androidvideo.c	Sun Nov 24 23:56:17 2013 -0500
   234.3 @@ -18,7 +18,7 @@
   234.4       misrepresented as being the original software.
   234.5    3. This notice may not be removed or altered from any source distribution.
   234.6  */
   234.7 -#include "SDL_config.h"
   234.8 +#include "../../SDL_internal.h"
   234.9  
  234.10  #if SDL_VIDEO_DRIVER_ANDROID
  234.11  
   235.1 --- a/src/video/android/SDL_androidvideo.h	Mon Dec 09 13:30:35 2013 -0500
   235.2 +++ b/src/video/android/SDL_androidvideo.h	Sun Nov 24 23:56:17 2013 -0500
   235.3 @@ -18,7 +18,7 @@
   235.4       misrepresented as being the original software.
   235.5    3. This notice may not be removed or altered from any source distribution.
   235.6  */
   235.7 -#include "SDL_config.h"
   235.8 +#include "../../SDL_internal.h"
   235.9  
  235.10  #ifndef _SDL_androidvideo_h
  235.11  #define _SDL_androidvideo_h
   236.1 --- a/src/video/android/SDL_androidwindow.c	Mon Dec 09 13:30:35 2013 -0500
   236.2 +++ b/src/video/android/SDL_androidwindow.c	Sun Nov 24 23:56:17 2013 -0500
   236.3 @@ -18,7 +18,7 @@
   236.4       misrepresented as being the original software.
   236.5    3. This notice may not be removed or altered from any source distribution.
   236.6  */
   236.7 -#include "SDL_config.h"
   236.8 +#include "../../SDL_internal.h"
   236.9  
  236.10  #if SDL_VIDEO_DRIVER_ANDROID
  236.11  
   237.1 --- a/src/video/android/SDL_androidwindow.h	Mon Dec 09 13:30:35 2013 -0500
   237.2 +++ b/src/video/android/SDL_androidwindow.h	Sun Nov 24 23:56:17 2013 -0500
   237.3 @@ -18,7 +18,7 @@
   237.4       misrepresented as being the original software.
   237.5    3. This notice may not be removed or altered from any source distribution.
   237.6  */
   237.7 -#include "SDL_config.h"
   237.8 +#include "../../SDL_internal.h"
   237.9  
  237.10  #ifndef _SDL_androidwindow_h
  237.11  #define _SDL_androidwindow_h
   238.1 --- a/src/video/cocoa/SDL_cocoaclipboard.h	Mon Dec 09 13:30:35 2013 -0500
   238.2 +++ b/src/video/cocoa/SDL_cocoaclipboard.h	Sun Nov 24 23:56:17 2013 -0500
   238.3 @@ -18,7 +18,7 @@
   238.4       misrepresented as being the original software.
   238.5    3. This notice may not be removed or altered from any source distribution.
   238.6  */
   238.7 -#include "SDL_config.h"
   238.8 +#include "../../SDL_internal.h"
   238.9  
  238.10  #ifndef _SDL_cocoaclipboard_h
  238.11  #define _SDL_cocoaclipboard_h
   239.1 --- a/src/video/cocoa/SDL_cocoaclipboard.m	Mon Dec 09 13:30:35 2013 -0500
   239.2 +++ b/src/video/cocoa/SDL_cocoaclipboard.m	Sun Nov 24 23:56:17 2013 -0500
   239.3 @@ -18,7 +18,7 @@
   239.4       misrepresented as being the original software.
   239.5    3. This notice may not be removed or altered from any source distribution.
   239.6  */
   239.7 -#include "SDL_config.h"
   239.8 +#include "../../SDL_internal.h"
   239.9  
  239.10  #if SDL_VIDEO_DRIVER_COCOA
  239.11  
   240.1 --- a/src/video/cocoa/SDL_cocoaevents.h	Mon Dec 09 13:30:35 2013 -0500
   240.2 +++ b/src/video/cocoa/SDL_cocoaevents.h	Sun Nov 24 23:56:17 2013 -0500
   240.3 @@ -18,7 +18,7 @@
   240.4       misrepresented as being the original software.
   240.5    3. This notice may not be removed or altered from any source distribution.
   240.6  */
   240.7 -#include "SDL_config.h"
   240.8 +#include "../../SDL_internal.h"
   240.9  
  240.10  #ifndef _SDL_cocoaevents_h
  240.11  #define _SDL_cocoaevents_h
   241.1 --- a/src/video/cocoa/SDL_cocoaevents.m	Mon Dec 09 13:30:35 2013 -0500
   241.2 +++ b/src/video/cocoa/SDL_cocoaevents.m	Sun Nov 24 23:56:17 2013 -0500
   241.3 @@ -18,7 +18,7 @@
   241.4       misrepresented as being the original software.
   241.5    3. This notice may not be removed or altered from any source distribution.
   241.6  */
   241.7 -#include "SDL_config.h"
   241.8 +#include "../../SDL_internal.h"
   241.9  
  241.10  #if SDL_VIDEO_DRIVER_COCOA
  241.11  #include "SDL_timer.h"
   242.1 --- a/src/video/cocoa/SDL_cocoakeyboard.h	Mon Dec 09 13:30:35 2013 -0500
   242.2 +++ b/src/video/cocoa/SDL_cocoakeyboard.h	Sun Nov 24 23:56:17 2013 -0500
   242.3 @@ -18,7 +18,7 @@
   242.4       misrepresented as being the original software.
   242.5    3. This notice may not be removed or altered from any source distribution.
   242.6  */
   242.7 -#include "SDL_config.h"
   242.8 +#include "../../SDL_internal.h"
   242.9  
  242.10  #ifndef _SDL_cocoakeyboard_h
  242.11  #define _SDL_cocoakeyboard_h
   243.1 --- a/src/video/cocoa/SDL_cocoakeyboard.m	Mon Dec 09 13:30:35 2013 -0500
   243.2 +++ b/src/video/cocoa/SDL_cocoakeyboard.m	Sun Nov 24 23:56:17 2013 -0500
   243.3 @@ -18,7 +18,7 @@
   243.4       misrepresented as being the original software.
   243.5    3. This notice may not be removed or altered from any source distribution.
   243.6  */
   243.7 -#include "SDL_config.h"
   243.8 +#include "../../SDL_internal.h"
   243.9  
  243.10  #if SDL_VIDEO_DRIVER_COCOA
  243.11  
   244.1 --- a/src/video/cocoa/SDL_cocoamessagebox.h	Mon Dec 09 13:30:35 2013 -0500
   244.2 +++ b/src/video/cocoa/SDL_cocoamessagebox.h	Sun Nov 24 23:56:17 2013 -0500
   244.3 @@ -18,7 +18,7 @@
   244.4       misrepresented as being the original software.
   244.5    3. This notice may not be removed or altered from any source distribution.
   244.6  */
   244.7 -#include "SDL_config.h"
   244.8 +#include "../../SDL_internal.h"
   244.9  
  244.10  #if SDL_VIDEO_DRIVER_COCOA
  244.11  
   245.1 --- a/src/video/cocoa/SDL_cocoamessagebox.m	Mon Dec 09 13:30:35 2013 -0500
   245.2 +++ b/src/video/cocoa/SDL_cocoamessagebox.m	Sun Nov 24 23:56:17 2013 -0500
   245.3 @@ -18,7 +18,7 @@
   245.4       misrepresented as being the original software.
   245.5    3. This notice may not be removed or altered from any source distribution.
   245.6  */
   245.7 -#include "SDL_config.h"
   245.8 +#include "../../SDL_internal.h"
   245.9  
  245.10  #if SDL_VIDEO_DRIVER_COCOA
  245.11  
   246.1 --- a/src/video/cocoa/SDL_cocoamodes.h	Mon Dec 09 13:30:35 2013 -0500
   246.2 +++ b/src/video/cocoa/SDL_cocoamodes.h	Sun Nov 24 23:56:17 2013 -0500
   246.3 @@ -18,7 +18,7 @@
   246.4       misrepresented as being the original software.
   246.5    3. This notice may not be removed or altered from any source distribution.
   246.6  */
   246.7 -#include "SDL_config.h"
   246.8 +#include "../../SDL_internal.h"
   246.9  
  246.10  #ifndef _SDL_cocoamodes_h
  246.11  #define _SDL_cocoamodes_h
   247.1 --- a/src/video/cocoa/SDL_cocoamodes.m	Mon Dec 09 13:30:35 2013 -0500
   247.2 +++ b/src/video/cocoa/SDL_cocoamodes.m	Sun Nov 24 23:56:17 2013 -0500
   247.3 @@ -18,7 +18,7 @@
   247.4       misrepresented as being the original software.
   247.5    3. This notice may not be removed or altered from any source distribution.
   247.6  */
   247.7 -#include "SDL_config.h"
   247.8 +#include "../../SDL_internal.h"
   247.9  
  247.10  #if SDL_VIDEO_DRIVER_COCOA
  247.11  
   248.1 --- a/src/video/cocoa/SDL_cocoamouse.h	Mon Dec 09 13:30:35 2013 -0500
   248.2 +++ b/src/video/cocoa/SDL_cocoamouse.h	Sun Nov 24 23:56:17 2013 -0500
   248.3 @@ -18,7 +18,7 @@
   248.4       misrepresented as being the original software.
   248.5    3. This notice may not be removed or altered from any source distribution.
   248.6  */
   248.7 -#include "SDL_config.h"
   248.8 +#include "../../SDL_internal.h"
   248.9  
  248.10  #ifndef _SDL_cocoamouse_h
  248.11  #define _SDL_cocoamouse_h
   249.1 --- a/src/video/cocoa/SDL_cocoamouse.m	Mon Dec 09 13:30:35 2013 -0500
   249.2 +++ b/src/video/cocoa/SDL_cocoamouse.m	Sun Nov 24 23:56:17 2013 -0500
   249.3 @@ -18,7 +18,7 @@
   249.4       misrepresented as being the original software.
   249.5    3. This notice may not be removed or altered from any source distribution.
   249.6  */
   249.7 -#include "SDL_config.h"
   249.8 +#include "../../SDL_internal.h"
   249.9  
  249.10  #if SDL_VIDEO_DRIVER_COCOA
  249.11  
   250.1 --- a/src/video/cocoa/SDL_cocoamousetap.h	Mon Dec 09 13:30:35 2013 -0500
   250.2 +++ b/src/video/cocoa/SDL_cocoamousetap.h	Sun Nov 24 23:56:17 2013 -0500
   250.3 @@ -18,7 +18,7 @@
   250.4       misrepresented as being the original software.
   250.5    3. This notice may not be removed or altered from any source distribution.
   250.6  */
   250.7 -#include "SDL_config.h"
   250.8 +#include "../../SDL_internal.h"
   250.9  
  250.10  #ifndef _SDL_cocoamousetap_h
  250.11  #define _SDL_cocoamousetap_h
   251.1 --- a/src/video/cocoa/SDL_cocoamousetap.m	Mon Dec 09 13:30:35 2013 -0500
   251.2 +++ b/src/video/cocoa/SDL_cocoamousetap.m	Sun Nov 24 23:56:17 2013 -0500
   251.3 @@ -18,7 +18,7 @@
   251.4       misrepresented as being the original software.
   251.5    3. This notice may not be removed or altered from any source distribution.
   251.6  */
   251.7 -#include "SDL_config.h"
   251.8 +#include "../../SDL_internal.h"
   251.9  
  251.10  #if SDL_VIDEO_DRIVER_COCOA
  251.11  
   252.1 --- a/src/video/cocoa/SDL_cocoaopengl.h	Mon Dec 09 13:30:35 2013 -0500
   252.2 +++ b/src/video/cocoa/SDL_cocoaopengl.h	Sun Nov 24 23:56:17 2013 -0500
   252.3 @@ -18,7 +18,7 @@
   252.4       misrepresented as being the original software.
   252.5    3. This notice may not be removed or altered from any source distribution.
   252.6  */
   252.7 -#include "SDL_config.h"
   252.8 +#include "../../SDL_internal.h"
   252.9  
  252.10  #ifndef _SDL_cocoaopengl_h
  252.11  #define _SDL_cocoaopengl_h
   253.1 --- a/src/video/cocoa/SDL_cocoaopengl.m	Mon Dec 09 13:30:35 2013 -0500
   253.2 +++ b/src/video/cocoa/SDL_cocoaopengl.m	Sun Nov 24 23:56:17 2013 -0500
   253.3 @@ -18,7 +18,7 @@
   253.4       misrepresented as being the original software.
   253.5    3. This notice may not be removed or altered from any source distribution.
   253.6  */
   253.7 -#include "SDL_config.h"
   253.8 +#include "../../SDL_internal.h"
   253.9  
  253.10  /* NSOpenGL implementation of SDL OpenGL support */
  253.11  
   254.1 --- a/src/video/cocoa/SDL_cocoashape.h	Mon Dec 09 13:30:35 2013 -0500
   254.2 +++ b/src/video/cocoa/SDL_cocoashape.h	Sun Nov 24 23:56:17 2013 -0500
   254.3 @@ -19,7 +19,7 @@
   254.4    3. This notice may not be removed or altered from any source distribution.
   254.5  */
   254.6  
   254.7 -#include "SDL_config.h"
   254.8 +#include "../../SDL_internal.h"
   254.9  
  254.10  #ifndef _SDL_cocoashape_h
  254.11  #define _SDL_cocoashape_h
   255.1 --- a/src/video/cocoa/SDL_cocoashape.m	Mon Dec 09 13:30:35 2013 -0500
   255.2 +++ b/src/video/cocoa/SDL_cocoashape.m	Sun Nov 24 23:56:17 2013 -0500
   255.3 @@ -19,7 +19,7 @@
   255.4    3. This notice may not be removed or altered from any source distribution.
   255.5  */
   255.6  
   255.7 -#include "SDL_config.h"
   255.8 +#include "../../SDL_internal.h"
   255.9  
  255.10  #if SDL_VIDEO_DRIVER_COCOA
  255.11  
   256.1 --- a/src/video/cocoa/SDL_cocoavideo.h	Mon Dec 09 13:30:35 2013 -0500
   256.2 +++ b/src/video/cocoa/SDL_cocoavideo.h	Sun Nov 24 23:56:17 2013 -0500
   256.3 @@ -18,7 +18,7 @@
   256.4       misrepresented as being the original software.
   256.5    3. This notice may not be removed or altered from any source distribution.
   256.6  */
   256.7 -#include "SDL_config.h"
   256.8 +#include "../../SDL_internal.h"
   256.9  
  256.10  #ifndef _SDL_cocoavideo_h
  256.11  #define _SDL_cocoavideo_h
   257.1 --- a/src/video/cocoa/SDL_cocoavideo.m	Mon Dec 09 13:30:35 2013 -0500
   257.2 +++ b/src/video/cocoa/SDL_cocoavideo.m	Sun Nov 24 23:56:17 2013 -0500
   257.3 @@ -18,7 +18,7 @@
   257.4       misrepresented as being the original software.
   257.5    3. This notice may not be removed or altered from any source distribution.
   257.6  */
   257.7 -#include "SDL_config.h"
   257.8 +#include "../../SDL_internal.h"
   257.9  
  257.10  #if SDL_VIDEO_DRIVER_COCOA
  257.11  
   258.1 --- a/src/video/cocoa/SDL_cocoawindow.h	Mon Dec 09 13:30:35 2013 -0500
   258.2 +++ b/src/video/cocoa/SDL_cocoawindow.h	Sun Nov 24 23:56:17 2013 -0500
   258.3 @@ -18,7 +18,7 @@
   258.4       misrepresented as being the original software.
   258.5    3. This notice may not be removed or altered from any source distribution.
   258.6  */
   258.7 -#include "SDL_config.h"
   258.8 +#include "../../SDL_internal.h"
   258.9  
  258.10  #ifndef _SDL_cocoawindow_h
  258.11  #define _SDL_cocoawindow_h
   259.1 --- a/src/video/cocoa/SDL_cocoawindow.m	Mon Dec 09 13:30:35 2013 -0500
   259.2 +++ b/src/video/cocoa/SDL_cocoawindow.m	Sun Nov 24 23:56:17 2013 -0500
   259.3 @@ -18,7 +18,7 @@
   259.4       misrepresented as being the original software.
   259.5    3. This notice may not be removed or altered from any source distribution.
   259.6  */
   259.7 -#include "SDL_config.h"
   259.8 +#include "../../SDL_internal.h"
   259.9  
  259.10  #if SDL_VIDEO_DRIVER_COCOA
  259.11  
   260.1 --- a/src/video/directfb/SDL_DirectFB_WM.c	Mon Dec 09 13:30:35 2013 -0500
   260.2 +++ b/src/video/directfb/SDL_DirectFB_WM.c	Sun Nov 24 23:56:17 2013 -0500
   260.3 @@ -18,7 +18,7 @@
   260.4       misrepresented as being the original software.
   260.5    3. This notice may not be removed or altered from any source distribution.
   260.6  */
   260.7 -#include "SDL_config.h"
   260.8 +#include "../../SDL_internal.h"
   260.9  
  260.10  #if SDL_VIDEO_DRIVER_DIRECTFB
  260.11  
   261.1 --- a/src/video/directfb/SDL_DirectFB_dyn.c	Mon Dec 09 13:30:35 2013 -0500
   261.2 +++ b/src/video/directfb/SDL_DirectFB_dyn.c	Sun Nov 24 23:56:17 2013 -0500
   261.3 @@ -18,7 +18,7 @@
   261.4       misrepresented as being the original software.
   261.5    3. This notice may not be removed or altered from any source distribution.
   261.6  */
   261.7 -#include "SDL_config.h"
   261.8 +#include "../../SDL_internal.h"
   261.9  
  261.10  #if SDL_VIDEO_DRIVER_DIRECTFB
  261.11  
   262.1 --- a/src/video/directfb/SDL_DirectFB_events.c	Mon Dec 09 13:30:35 2013 -0500
   262.2 +++ b/src/video/directfb/SDL_DirectFB_events.c	Sun Nov 24 23:56:17 2013 -0500
   262.3 @@ -18,7 +18,7 @@
   262.4       misrepresented as being the original software.
   262.5    3. This notice may not be removed or altered from any source distribution.
   262.6  */
   262.7 -#include "SDL_config.h"
   262.8 +#include "../../SDL_internal.h"
   262.9  
  262.10  #if SDL_VIDEO_DRIVER_DIRECTFB
  262.11  
   263.1 --- a/src/video/directfb/SDL_DirectFB_modes.c	Mon Dec 09 13:30:35 2013 -0500
   263.2 +++ b/src/video/directfb/SDL_DirectFB_modes.c	Sun Nov 24 23:56:17 2013 -0500
   263.3 @@ -18,7 +18,7 @@
   263.4       misrepresented as being the original software.
   263.5    3. This notice may not be removed or altered from any source distribution.
   263.6  */
   263.7 -#include "SDL_config.h"
   263.8 +#include "../../SDL_internal.h"
   263.9  
  263.10  #if SDL_VIDEO_DRIVER_DIRECTFB
  263.11  
   264.1 --- a/src/video/directfb/SDL_DirectFB_mouse.c	Mon Dec 09 13:30:35 2013 -0500
   264.2 +++ b/src/video/directfb/SDL_DirectFB_mouse.c	Sun Nov 24 23:56:17 2013 -0500
   264.3 @@ -18,7 +18,7 @@
   264.4       misrepresented as being the original software.
   264.5    3. This notice may not be removed or altered from any source distribution.
   264.6  */
   264.7 -#include "SDL_config.h"
   264.8 +#include "../../SDL_internal.h"
   264.9  
  264.10  #if SDL_VIDEO_DRIVER_DIRECTFB
  264.11  
   265.1 --- a/src/video/directfb/SDL_DirectFB_opengl.c	Mon Dec 09 13:30:35 2013 -0500
   265.2 +++ b/src/video/directfb/SDL_DirectFB_opengl.c	Sun Nov 24 23:56:17 2013 -0500
   265.3 @@ -18,7 +18,7 @@
   265.4       misrepresented as being the original software.
   265.5    3. This notice may not be removed or altered from any source distribution.
   265.6  */
   265.7 -#include "SDL_config.h"
   265.8 +#include "../../SDL_internal.h"
   265.9  
  265.10  #if SDL_VIDEO_DRIVER_DIRECTFB
  265.11  
   266.1 --- a/src/video/directfb/SDL_DirectFB_render.c	Mon Dec 09 13:30:35 2013 -0500
   266.2 +++ b/src/video/directfb/SDL_DirectFB_render.c	Sun Nov 24 23:56:17 2013 -0500
   266.3 @@ -18,7 +18,7 @@
   266.4       misrepresented as being the original software.
   266.5    3. This notice may not be removed or altered from any source distribution.
   266.6  */
   266.7 -#include "SDL_config.h"
   266.8 +#include "../../SDL_internal.h"
   266.9  
  266.10  #if SDL_VIDEO_DRIVER_DIRECTFB
  266.11  #include "SDL_DirectFB_window.h"
   267.1 --- a/src/video/directfb/SDL_DirectFB_shape.c	Mon Dec 09 13:30:35 2013 -0500
   267.2 +++ b/src/video/directfb/SDL_DirectFB_shape.c	Sun Nov 24 23:56:17 2013 -0500
   267.3 @@ -18,7 +18,7 @@
   267.4       misrepresented as being the original software.
   267.5    3. This notice may not be removed or altered from any source distribution.
   267.6  */
   267.7 -#include "SDL_config.h"
   267.8 +#include "../../SDL_internal.h"
   267.9  
  267.10  #if SDL_VIDEO_DRIVER_DIRECTFB
  267.11  
   268.1 --- a/src/video/directfb/SDL_DirectFB_video.c	Mon Dec 09 13:30:35 2013 -0500
   268.2 +++ b/src/video/directfb/SDL_DirectFB_video.c	Sun Nov 24 23:56:17 2013 -0500
   268.3 @@ -18,7 +18,7 @@
   268.4       misrepresented as being the original software.
   268.5    3. This notice may not be removed or altered from any source distribution.
   268.6  */
   268.7 -#include "SDL_config.h"
   268.8 +#include "../../SDL_internal.h"
   268.9  
  268.10  #if SDL_VIDEO_DRIVER_DIRECTFB
  268.11  
  268.12 @@ -35,7 +35,7 @@
  268.13  #include "SDL_DirectFB_WM.h"
  268.14  
  268.15  
  268.16 -#include "SDL_config.h"
  268.17 +#include "../../SDL_internal.h"
  268.18  
  268.19  /* DirectFB video driver implementation.
  268.20  */
   269.1 --- a/src/video/directfb/SDL_DirectFB_video.h	Mon Dec 09 13:30:35 2013 -0500
   269.2 +++ b/src/video/directfb/SDL_DirectFB_video.h	Sun Nov 24 23:56:17 2013 -0500
   269.3 @@ -19,7 +19,7 @@
   269.4    3. This notice may not be removed or altered from any source distribution.
   269.5  */
   269.6  
   269.7 -#include "SDL_config.h"
   269.8 +#include "../../SDL_internal.h"
   269.9  
  269.10  #ifndef _SDL_DirectFB_video_h
  269.11  #define _SDL_DirectFB_video_h
   270.1 --- a/src/video/directfb/SDL_DirectFB_window.c	Mon Dec 09 13:30:35 2013 -0500
   270.2 +++ b/src/video/directfb/SDL_DirectFB_window.c	Sun Nov 24 23:56:17 2013 -0500
   270.3 @@ -18,7 +18,7 @@
   270.4       misrepresented as being the original software.
   270.5    3. This notice may not be removed or altered from any source distribution.
   270.6  */
   270.7 -#include "SDL_config.h"
   270.8 +#include "../../SDL_internal.h"
   270.9  
  270.10  #if SDL_VIDEO_DRIVER_DIRECTFB
  270.11  
   271.1 --- a/src/video/dummy/SDL_nullevents.c	Mon Dec 09 13:30:35 2013 -0500
   271.2 +++ b/src/video/dummy/SDL_nullevents.c	Sun Nov 24 23:56:17 2013 -0500
   271.3 @@ -18,7 +18,7 @@
   271.4       misrepresented as being the original software.
   271.5    3. This notice may not be removed or altered from any source distribution.
   271.6  */
   271.7 -#include "SDL_config.h"
   271.8 +#include "../../SDL_internal.h"
   271.9  
  271.10  #if SDL_VIDEO_DRIVER_DUMMY
  271.11  
   272.1 --- a/src/video/dummy/SDL_nullevents_c.h	Mon Dec 09 13:30:35 2013 -0500
   272.2 +++ b/src/video/dummy/SDL_nullevents_c.h	Sun Nov 24 23:56:17 2013 -0500
   272.3 @@ -18,7 +18,7 @@
   272.4       misrepresented as being the original software.
   272.5    3. This notice may not be removed or altered from any source distribution.
   272.6  */
   272.7 -#include "SDL_config.h"
   272.8 +#include "../../SDL_internal.h"
   272.9  
  272.10  #include "SDL_nullvideo.h"
  272.11  
   273.1 --- a/src/video/dummy/SDL_nullframebuffer.c	Mon Dec 09 13:30:35 2013 -0500
   273.2 +++ b/src/video/dummy/SDL_nullframebuffer.c	Sun Nov 24 23:56:17 2013 -0500
   273.3 @@ -18,7 +18,7 @@
   273.4       misrepresented as being the original software.
   273.5    3. This notice may not be removed or altered from any source distribution.
   273.6  */
   273.7 -#include "SDL_config.h"
   273.8 +#include "../../SDL_internal.h"
   273.9  
  273.10  #if SDL_VIDEO_DRIVER_DUMMY
  273.11  
   274.1 --- a/src/video/dummy/SDL_nullframebuffer_c.h	Mon Dec 09 13:30:35 2013 -0500
   274.2 +++ b/src/video/dummy/SDL_nullframebuffer_c.h	Sun Nov 24 23:56:17 2013 -0500
   274.3 @@ -18,7 +18,7 @@
   274.4       misrepresented as being the original software.
   274.5    3. This notice may not be removed or altered from any source distribution.
   274.6  */
   274.7 -#include "SDL_config.h"
   274.8 +#include "../../SDL_internal.h"
   274.9  
  274.10  extern int SDL_DUMMY_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format, void ** pixels, int *pitch);
  274.11  extern int SDL_DUMMY_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rect * rects, int numrects);
   275.1 --- a/src/video/dummy/SDL_nullvideo.c	Mon Dec 09 13:30:35 2013 -0500
   275.2 +++ b/src/video/dummy/SDL_nullvideo.c	Sun Nov 24 23:56:17 2013 -0500
   275.3 @@ -18,7 +18,7 @@
   275.4       misrepresented as being the original software.
   275.5    3. This notice may not be removed or altered from any source distribution.
   275.6  */
   275.7 -#include "SDL_config.h"
   275.8 +#include "../../SDL_internal.h"
   275.9  
  275.10  #if SDL_VIDEO_DRIVER_DUMMY
  275.11  
   276.1 --- a/src/video/dummy/SDL_nullvideo.h	Mon Dec 09 13:30:35 2013 -0500
   276.2 +++ b/src/video/dummy/SDL_nullvideo.h	Sun Nov 24 23:56:17 2013 -0500
   276.3 @@ -18,7 +18,7 @@
   276.4       misrepresented as being the original software.
   276.5    3. This notice may not be removed or altered from any source distribution.
   276.6  */
   276.7 -#include "SDL_config.h"
   276.8 +#include "../../SDL_internal.h"
   276.9  
  276.10  #ifndef _SDL_nullvideo_h
  276.11  #define _SDL_nullvideo_h
   277.1 --- a/src/video/haiku/SDL_BWin.h	Mon Dec 09 13:30:35 2013 -0500
   277.2 +++ b/src/video/haiku/SDL_BWin.h	Sun Nov 24 23:56:17 2013 -0500
   277.3 @@ -26,7 +26,7 @@
   277.4  extern "C" {
   277.5  #endif
   277.6  
   277.7 -#include "SDL_config.h"
   277.8 +#include "../../SDL_internal.h"
   277.9  #include "SDL.h"
  277.10  #include "SDL_syswm.h"
  277.11  #include "SDL_bframebuffer.h"
   278.1 --- a/src/video/haiku/SDL_bclipboard.cc	Mon Dec 09 13:30:35 2013 -0500
   278.2 +++ b/src/video/haiku/SDL_bclipboard.cc	Sun Nov 24 23:56:17 2013 -0500
   278.3 @@ -18,7 +18,7 @@
   278.4       misrepresented as being the original software.
   278.5    3. This notice may not be removed or altered from any source distribution.
   278.6  */
   278.7 -#include "SDL_config.h"
   278.8 +#include "../../SDL_internal.h"
   278.9  
  278.10  #if SDL_VIDEO_DRIVER_HAIKU
  278.11  
   279.1 --- a/src/video/haiku/SDL_bclipboard.h	Mon Dec 09 13:30:35 2013 -0500
   279.2 +++ b/src/video/haiku/SDL_bclipboard.h	Sun Nov 24 23:56:17 2013 -0500
   279.3 @@ -19,7 +19,7 @@
   279.4    3. This notice may not be removed or altered from any source distribution.
   279.5  */
   279.6  
   279.7 -#include "SDL_config.h"
   279.8 +#include "../../SDL_internal.h"
   279.9  
  279.10  #ifndef SDL_BCLIPBOARD_H
  279.11  #define SDL_BCLIPBOARD_H
   280.1 --- a/src/video/haiku/SDL_bevents.cc	Mon Dec 09 13:30:35 2013 -0500
   280.2 +++ b/src/video/haiku/SDL_bevents.cc	Sun Nov 24 23:56:17 2013 -0500
   280.3 @@ -18,7 +18,7 @@
   280.4       misrepresented as being the original software.
   280.5    3. This notice may not be removed or altered from any source distribution.
   280.6  */
   280.7 -#include "SDL_config.h"
   280.8 +#include "../../SDL_internal.h"
   280.9  
  280.10  #if SDL_VIDEO_DRIVER_HAIKU
  280.11  
   281.1 --- a/src/video/haiku/SDL_bframebuffer.cc	Mon Dec 09 13:30:35 2013 -0500
   281.2 +++ b/src/video/haiku/SDL_bframebuffer.cc	Sun Nov 24 23:56:17 2013 -0500
   281.3 @@ -18,7 +18,7 @@
   281.4       misrepresented as being the original software.
   281.5    3. This notice may not be removed or altered from any source distribution.
   281.6  */
   281.7 -#include "SDL_config.h"
   281.8 +#include "../../SDL_internal.h"
   281.9  
  281.10  #if SDL_VIDEO_DRIVER_HAIKU
  281.11  
   282.1 --- a/src/video/haiku/SDL_bkeyboard.cc	Mon Dec 09 13:30:35 2013 -0500
   282.2 +++ b/src/video/haiku/SDL_bkeyboard.cc	Sun Nov 24 23:56:17 2013 -0500
   282.3 @@ -18,7 +18,7 @@
   282.4       misrepresented as being the original software.
   282.5    3. This notice may not be removed or altered from any source distribution.
   282.6  */
   282.7 -#include "SDL_config.h"
   282.8 +#include "../../SDL_internal.h"
   282.9  
  282.10  #if SDL_VIDEO_DRIVER_HAIKU
  282.11  
   283.1 --- a/src/video/haiku/SDL_bmodes.cc	Mon Dec 09 13:30:35 2013 -0500
   283.2 +++ b/src/video/haiku/SDL_bmodes.cc	Sun Nov 24 23:56:17 2013 -0500
   283.3 @@ -18,7 +18,7 @@
   283.4       misrepresented as being the original software.
   283.5    3. This notice may not be removed or altered from any source distribution.
   283.6  */
   283.7 -#include "SDL_config.h"
   283.8 +#include "../../SDL_internal.h"
   283.9  
  283.10  #if SDL_VIDEO_DRIVER_HAIKU
  283.11  
   284.1 --- a/src/video/haiku/SDL_bopengl.cc	Mon Dec 09 13:30:35 2013 -0500
   284.2 +++ b/src/video/haiku/SDL_bopengl.cc	Sun Nov 24 23:56:17 2013 -0500
   284.3 @@ -18,7 +18,7 @@
   284.4       misrepresented as being the original software.
   284.5    3. This notice may not be removed or altered from any source distribution.
   284.6  */
   284.7 -#include "SDL_config.h"
   284.8 +#include "../../SDL_internal.h"
   284.9  
  284.10  #if SDL_VIDEO_DRIVER_HAIKU
  284.11  
   285.1 --- a/src/video/haiku/SDL_bvideo.cc	Mon Dec 09 13:30:35 2013 -0500
   285.2 +++ b/src/video/haiku/SDL_bvideo.cc	Sun Nov 24 23:56:17 2013 -0500
   285.3 @@ -18,7 +18,7 @@
   285.4       misrepresented as being the original software.
   285.5    3. This notice may not be removed or altered from any source distribution.
   285.6  */
   285.7 -#include "SDL_config.h"
   285.8 +#include "../../SDL_internal.h"
   285.9  
  285.10  #if SDL_VIDEO_DRIVER_HAIKU
  285.11  
   286.1 --- a/src/video/haiku/SDL_bwindow.cc	Mon Dec 09 13:30:35 2013 -0500
   286.2 +++ b/src/video/haiku/SDL_bwindow.cc	Sun Nov 24 23:56:17 2013 -0500
   286.3 @@ -18,7 +18,7 @@
   286.4       misrepresented as being the original software.
   286.5    3. This notice may not be removed or altered from any source distribution.
   286.6  */
   286.7 -#include "SDL_config.h"
   286.8 +#include "../../SDL_internal.h"
   286.9  
  286.10  #if SDL_VIDEO_DRIVER_HAIKU
  286.11  #include "../SDL_sysvideo.h"
   287.1 --- a/src/video/pandora/SDL_pandora.c	Mon Dec 09 13:30:35 2013 -0500
   287.2 +++ b/src/video/pandora/SDL_pandora.c	Sun Nov 24 23:56:17 2013 -0500
   287.3 @@ -18,7 +18,7 @@
   287.4       misrepresented as being the original software.
   287.5    3. This notice may not be removed or altered from any source distribution.
   287.6  */
   287.7 -#include "SDL_config.h"
   287.8 +#include "../../SDL_internal.h"
   287.9  
  287.10  #if SDL_VIDEO_DRIVER_PANDORA
  287.11  
   288.1 --- a/src/video/pandora/SDL_pandora.h	Mon Dec 09 13:30:35 2013 -0500
   288.2 +++ b/src/video/pandora/SDL_pandora.h	Sun Nov 24 23:56:17 2013 -0500
   288.3 @@ -24,7 +24,7 @@
   288.4  
   288.5  #include <GLES/egl.h>
   288.6  
   288.7 -#include "SDL_config.h"
   288.8 +#include "../../SDL_internal.h"
   288.9  #include "../SDL_sysvideo.h"
  288.10  
  288.11  typedef struct SDL_VideoData
   289.1 --- a/src/video/pandora/SDL_pandora_events.c	Mon Dec 09 13:30:35 2013 -0500
   289.2 +++ b/src/video/pandora/SDL_pandora_events.c	Sun Nov 24 23:56:17 2013 -0500
   289.3 @@ -18,7 +18,7 @@
   289.4       misrepresented as being the original software.
   289.5    3. This notice may not be removed or altered from any source distribution.
   289.6  */
   289.7 -#include "SDL_config.h"
   289.8 +#include "../../SDL_internal.h"
   289.9  
  289.10  #if SDL_VIDEO_DRIVER_PANDORA
  289.11  
   290.1 --- a/src/video/pandora/SDL_pandora_events.h	Mon Dec 09 13:30:35 2013 -0500
   290.2 +++ b/src/video/pandora/SDL_pandora_events.h	Sun Nov 24 23:56:17 2013 -0500
   290.3 @@ -18,7 +18,7 @@
   290.4       misrepresented as being the original software.
   290.5    3. This notice may not be removed or altered from any source distribution.
   290.6  */
   290.7 -#include "SDL_config.h"
   290.8 +#include "../../SDL_internal.h"
   290.9  
  290.10  extern void PND_PumpEvents(_THIS);
  290.11  
   291.1 --- a/src/video/psp/SDL_pspvideo.c	Mon Dec 09 13:30:35 2013 -0500
   291.2 +++ b/src/video/psp/SDL_pspvideo.c	Sun Nov 24 23:56:17 2013 -0500
   291.3 @@ -19,7 +19,7 @@
   291.4    3. This notice may not be removed or altered from any source distribution.
   291.5  */
   291.6  
   291.7 -#include "SDL_config.h"
   291.8 +#include "../../SDL_internal.h"
   291.9  
  291.10  #if SDL_VIDEO_DRIVER_PSP
  291.11  
   292.1 --- a/src/video/psp/SDL_pspvideo.h	Mon Dec 09 13:30:35 2013 -0500
   292.2 +++ b/src/video/psp/SDL_pspvideo.h	Sun Nov 24 23:56:17 2013 -0500
   292.3 @@ -24,7 +24,7 @@
   292.4  
   292.5  #include <GLES/egl.h>
   292.6  
   292.7 -#include "SDL_config.h"
   292.8 +#include "../../SDL_internal.h"
   292.9  #include "../SDL_sysvideo.h"
  292.10  
  292.11  typedef struct SDL_VideoData
   293.1 --- a/src/video/raspberry/SDL_rpievents.c	Mon Dec 09 13:30:35 2013 -0500
   293.2 +++ b/src/video/raspberry/SDL_rpievents.c	Sun Nov 24 23:56:17 2013 -0500
   293.3 @@ -19,7 +19,7 @@
   293.4    3. This notice may not be removed or altered from any source distribution.
   293.5  */
   293.6  
   293.7 -#include "SDL_config.h"
   293.8 +#include "../../SDL_internal.h"
   293.9  
  293.10  #if SDL_VIDEO_DRIVER_RPI
  293.11  
   294.1 --- a/src/video/raspberry/SDL_rpimouse.c	Mon Dec 09 13:30:35 2013 -0500
   294.2 +++ b/src/video/raspberry/SDL_rpimouse.c	Sun Nov 24 23:56:17 2013 -0500
   294.3 @@ -18,7 +18,7 @@
   294.4       misrepresented as being the original software.
   294.5    3. This notice may not be removed or altered from any source distribution.
   294.6  */
   294.7 -#include "SDL_config.h"
   294.8 +#include "../../SDL_internal.h"
   294.9  
  294.10  #if SDL_VIDEO_DRIVER_RPI
  294.11  
   295.1 --- a/src/video/raspberry/SDL_rpiopengles.c	Mon Dec 09 13:30:35 2013 -0500
   295.2 +++ b/src/video/raspberry/SDL_rpiopengles.c	Sun Nov 24 23:56:17 2013 -0500
   295.3 @@ -18,7 +18,7 @@
   295.4       misrepresented as being the original software.
   295.5    3. This notice may not be removed or altered from any source distribution.
   295.6  */
   295.7 -#include "SDL_config.h"
   295.8 +#include "../../SDL_internal.h"
   295.9  
  295.10  #if SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL
  295.11  
   296.1 --- a/src/video/raspberry/SDL_rpiopengles.h	Mon Dec 09 13:30:35 2013 -0500
   296.2 +++ b/src/video/raspberry/SDL_rpiopengles.h	Sun Nov 24 23:56:17 2013 -0500
   296.3 @@ -18,7 +18,7 @@
   296.4       misrepresented as being the original software.
   296.5    3. This notice may not be removed or altered from any source distribution.
   296.6  */
   296.7 -#include "SDL_config.h"
   296.8 +#include "../../SDL_internal.h"
   296.9  
  296.10  #ifndef _SDL_rpiopengles_h
  296.11  #define _SDL_rpiopengles_h
   297.1 --- a/src/video/raspberry/SDL_rpivideo.c	Mon Dec 09 13:30:35 2013 -0500
   297.2 +++ b/src/video/raspberry/SDL_rpivideo.c	Sun Nov 24 23:56:17 2013 -0500
   297.3 @@ -19,7 +19,7 @@
   297.4    3. This notice may not be removed or altered from any source distribution.
   297.5  */
   297.6  
   297.7 -#include "SDL_config.h"
   297.8 +#include "../../SDL_internal.h"
   297.9  
  297.10  #if SDL_VIDEO_DRIVER_RPI
  297.11  
   298.1 --- a/src/video/raspberry/SDL_rpivideo.h	Mon Dec 09 13:30:35 2013 -0500
   298.2 +++ b/src/video/raspberry/SDL_rpivideo.h	Sun Nov 24 23:56:17 2013 -0500
   298.3 @@ -22,7 +22,7 @@
   298.4  #ifndef __SDL_RPIVIDEO_H__
   298.5  #define __SDL_RPIVIDEO_H__
   298.6  
   298.7 -#include "SDL_config.h"
   298.8 +#include "../../SDL_internal.h"
   298.9  #include "../SDL_sysvideo.h"
  298.10  
  298.11  #include "bcm_host.h"
   299.1 --- a/src/video/sdlgenblit.pl	Mon Dec 09 13:30:35 2013 -0500
   299.2 +++ b/src/video/sdlgenblit.pl	Sun Nov 24 23:56:17 2013 -0500
   299.3 @@ -100,7 +100,7 @@
   299.4       misrepresented as being the original software.
   299.5    3. This notice may not be removed or altered from any source distribution.
   299.6  */
   299.7 -#include "SDL_config.h"
   299.8 +#include "../SDL_internal.h"
   299.9  
  299.10  /* *INDENT-OFF* */
  299.11  
   300.1 --- a/src/video/uikit/SDL_uikitappdelegate.m	Mon Dec 09 13:30:35 2013 -0500
   300.2 +++ b/src/video/uikit/SDL_uikitappdelegate.m	Sun Nov 24 23:56:17 2013 -0500
   300.3 @@ -18,7 +18,7 @@
   300.4       misrepresented as being the original software.
   300.5    3. This notice may not be removed or altered from any source distribution.
   300.6  */
   300.7 -#include "SDL_config.h"
   300.8 +#include "../../SDL_internal.h"
   300.9  
  300.10  #if SDL_VIDEO_DRIVER_UIKIT
  300.11  
   301.1 --- a/src/video/uikit/SDL_uikitevents.m	Mon Dec 09 13:30:35 2013 -0500
   301.2 +++ b/src/video/uikit/SDL_uikitevents.m	Sun Nov 24 23:56:17 2013 -0500
   301.3 @@ -18,7 +18,7 @@
   301.4       misrepresented as being the original software.
   301.5    3. This notice may not be removed or altered from any source distribution.
   301.6  */
   301.7 -#include "SDL_config.h"
   301.8 +#include "../../SDL_internal.h"
   301.9  
  301.10  #if SDL_VIDEO_DRIVER_UIKIT
  301.11  
   302.1 --- a/src/video/uikit/SDL_uikitmessagebox.h	Mon Dec 09 13:30:35 2013 -0500
   302.2 +++ b/src/video/uikit/SDL_uikitmessagebox.h	Sun Nov 24 23:56:17 2013 -0500
   302.3 @@ -18,7 +18,7 @@
   302.4       misrepresented as being the original software.
   302.5    3. This notice may not be removed or altered from any source distribution.
   302.6  */
   302.7 -#include "SDL_config.h"
   302.8 +#include "../../SDL_internal.h"
   302.9  
  302.10  #if SDL_VIDEO_DRIVER_UIKIT
  302.11  
   303.1 --- a/src/video/uikit/SDL_uikitmessagebox.m	Mon Dec 09 13:30:35 2013 -0500
   303.2 +++ b/src/video/uikit/SDL_uikitmessagebox.m	Sun Nov 24 23:56:17 2013 -0500
   303.3 @@ -18,7 +18,7 @@
   303.4       misrepresented as being the original software.
   303.5    3. This notice may not be removed or altered from any source distribution.
   303.6  */
   303.7 -#include "SDL_config.h"
   303.8 +#include "../../SDL_internal.h"
   303.9  
  303.10  #if SDL_VIDEO_DRIVER_UIKIT
  303.11  
   304.1 --- a/src/video/uikit/SDL_uikitmodes.h	Mon Dec 09 13:30:35 2013 -0500
   304.2 +++ b/src/video/uikit/SDL_uikitmodes.h	Sun Nov 24 23:56:17 2013 -0500
   304.3 @@ -18,7 +18,7 @@
   304.4       misrepresented as being the original software.
   304.5    3. This notice may not be removed or altered from any source distribution.
   304.6  */
   304.7 -#include "SDL_config.h"
   304.8 +#include "../../SDL_internal.h"
   304.9  
  304.10  #ifndef _SDL_uikitmodes_h
  304.11  #define _SDL_uikitmodes_h
   305.1 --- a/src/video/uikit/SDL_uikitmodes.m	Mon Dec 09 13:30:35 2013 -0500
   305.2 +++ b/src/video/uikit/SDL_uikitmodes.m	Sun Nov 24 23:56:17 2013 -0500
   305.3 @@ -18,7 +18,7 @@
   305.4       misrepresented as being the original software.
   305.5    3. This notice may not be removed or altered from any source distribution.
   305.6  */
   305.7 -#include "SDL_config.h"
   305.8 +#include "../../SDL_internal.h"
   305.9  
  305.10  #if SDL_VIDEO_DRIVER_UIKIT
  305.11  
   306.1 --- a/src/video/uikit/SDL_uikitopengles.m	Mon Dec 09 13:30:35 2013 -0500
   306.2 +++ b/src/video/uikit/SDL_uikitopengles.m	Sun Nov 24 23:56:17 2013 -0500
   306.3 @@ -18,7 +18,7 @@
   306.4       misrepresented as being the original software.
   306.5    3. This notice may not be removed or altered from any source distribution.
   306.6  */
   306.7 -#include "SDL_config.h"
   306.8 +#include "../../SDL_internal.h"
   306.9  
  306.10  #if SDL_VIDEO_DRIVER_UIKIT
  306.11  
   307.1 --- a/src/video/uikit/SDL_uikitopenglview.m	Mon Dec 09 13:30:35 2013 -0500
   307.2 +++ b/src/video/uikit/SDL_uikitopenglview.m	Sun Nov 24 23:56:17 2013 -0500
   307.3 @@ -18,7 +18,7 @@
   307.4       misrepresented as being the original software.
   307.5    3. This notice may not be removed or altered from any source distribution.
   307.6  */
   307.7 -#include "SDL_config.h"
   307.8 +#include "../../SDL_internal.h"
   307.9  
  307.10  #if SDL_VIDEO_DRIVER_UIKIT
  307.11  
   308.1 --- a/src/video/uikit/SDL_uikitvideo.m	Mon Dec 09 13:30:35 2013 -0500
   308.2 +++ b/src/video/uikit/SDL_uikitvideo.m	Sun Nov 24 23:56:17 2013 -0500
   308.3 @@ -18,7 +18,7 @@
   308.4       misrepresented as being the original software.
   308.5    3. This notice may not be removed or altered from any source distribution.
   308.6  */
   308.7 -#include "SDL_config.h"
   308.8 +#include "../../SDL_internal.h"
   308.9  
  308.10  #if SDL_VIDEO_DRIVER_UIKIT
  308.11  
   309.1 --- a/src/video/uikit/SDL_uikitview.m	Mon Dec 09 13:30:35 2013 -0500
   309.2 +++ b/src/video/uikit/SDL_uikitview.m	Sun Nov 24 23:56:17 2013 -0500
   309.3 @@ -18,7 +18,7 @@
   309.4       misrepresented as being the original software.
   309.5    3. This notice may not be removed or altered from any source distribution.
   309.6  */
   309.7 -#include "SDL_config.h"
   309.8 +#include "../../SDL_internal.h"
   309.9  
  309.10  #if SDL_VIDEO_DRIVER_UIKIT
  309.11  
   310.1 --- a/src/video/uikit/SDL_uikitviewcontroller.m	Mon Dec 09 13:30:35 2013 -0500
   310.2 +++ b/src/video/uikit/SDL_uikitviewcontroller.m	Sun Nov 24 23:56:17 2013 -0500
   310.3 @@ -18,7 +18,7 @@
   310.4       misrepresented as being the original software.
   310.5    3. This notice may not be removed or altered from any source distribution.
   310.6  */
   310.7 -#include "SDL_config.h"
   310.8 +#include "../../SDL_internal.h"
   310.9  
  310.10  #if SDL_VIDEO_DRIVER_UIKIT
  310.11  
   311.1 --- a/src/video/uikit/SDL_uikitwindow.m	Mon Dec 09 13:30:35 2013 -0500
   311.2 +++ b/src/video/uikit/SDL_uikitwindow.m	Sun Nov 24 23:56:17 2013 -0500
   311.3 @@ -18,7 +18,7 @@
   311.4       misrepresented as being the original software.
   311.5    3. This notice may not be removed or altered from any source distribution.
   311.6  */
   311.7 -#include "SDL_config.h"
   311.8 +#include "../../SDL_internal.h"
   311.9  
  311.10  #if SDL_VIDEO_DRIVER_UIKIT
  311.11  
   312.1 --- a/src/video/windows/SDL_windowsclipboard.c	Mon Dec 09 13:30:35 2013 -0500
   312.2 +++ b/src/video/windows/SDL_windowsclipboard.c	Sun Nov 24 23:56:17 2013 -0500
   312.3 @@ -18,7 +18,7 @@
   312.4       misrepresented as being the original software.
   312.5    3. This notice may not be removed or altered from any source distribution.
   312.6  */
   312.7 -#include "SDL_config.h"
   312.8 +#include "../../SDL_internal.h"
   312.9  
  312.10  #if SDL_VIDEO_DRIVER_WINDOWS
  312.11  
   313.1 --- a/src/video/windows/SDL_windowsclipboard.h	Mon Dec 09 13:30:35 2013 -0500
   313.2 +++ b/src/video/windows/SDL_windowsclipboard.h	Sun Nov 24 23:56:17 2013 -0500
   313.3 @@ -18,7 +18,7 @@
   313.4       misrepresented as being the original software.
   313.5    3. This notice may not be removed or altered from any source distribution.
   313.6  */
   313.7 -#include "SDL_config.h"
   313.8 +#include "../../SDL_internal.h"
   313.9  
  313.10  #ifndef _SDL_windowsclipboard_h
  313.11  #define _SDL_windowsclipboard_h
   314.1 --- a/src/video/windows/SDL_windowsevents.c	Mon Dec 09 13:30:35 2013 -0500
   314.2 +++ b/src/video/windows/SDL_windowsevents.c	Sun Nov 24 23:56:17 2013 -0500
   314.3 @@ -18,7 +18,7 @@
   314.4       misrepresented as being the original software.
   314.5    3. This notice may not be removed or altered from any source distribution.
   314.6  */
   314.7 -#include "SDL_config.h"
   314.8 +#include "../../SDL_internal.h"
   314.9  
  314.10  #if SDL_VIDEO_DRIVER_WINDOWS
  314.11  
   315.1 --- a/src/video/windows/SDL_windowsevents.h	Mon Dec 09 13:30:35 2013 -0500
   315.2 +++ b/src/video/windows/SDL_windowsevents.h	Sun Nov 24 23:56:17 2013 -0500
   315.3 @@ -18,7 +18,7 @@
   315.4       misrepresented as being the original software.
   315.5    3. This notice may not be removed or altered from any source distribution.
   315.6  */
   315.7 -#include "SDL_config.h"
   315.8 +#include "../../SDL_internal.h"
   315.9  
  315.10  #ifndef _SDL_windowsevents_h
  315.11  #define _SDL_windowsevents_h
   316.1 --- a/src/video/windows/SDL_windowsframebuffer.c	Mon Dec 09 13:30:35 2013 -0500
   316.2 +++ b/src/video/windows/SDL_windowsframebuffer.c	Sun Nov 24 23:56:17 2013 -0500
   316.3 @@ -18,7 +18,7 @@
   316.4       misrepresented as being the original software.
   316.5    3. This notice may not be removed or altered from any source distribution.
   316.6  */
   316.7 -#include "SDL_config.h"
   316.8 +#include "../../SDL_internal.h"
   316.9  
  316.10  #if SDL_VIDEO_DRIVER_WINDOWS
  316.11  
   317.1 --- a/src/video/windows/SDL_windowsframebuffer.h	Mon Dec 09 13:30:35 2013 -0500
   317.2 +++ b/src/video/windows/SDL_windowsframebuffer.h	Sun Nov 24 23:56:17 2013 -0500
   317.3 @@ -18,7 +18,7 @@
   317.4       misrepresented as being the original software.
   317.5    3. This notice may not be removed or altered from any source distribution.
   317.6  */
   317.7 -#include "SDL_config.h"
   317.8 +#include "../../SDL_internal.h"
   317.9  
  317.10  extern int WIN_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format, void ** pixels, int *pitch);
  317.11  extern int WIN_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rect * rects, int numrects);
   318.1 --- a/src/video/windows/SDL_windowskeyboard.c	Mon Dec 09 13:30:35 2013 -0500
   318.2 +++ b/src/video/windows/SDL_windowskeyboard.c	Sun Nov 24 23:56:17 2013 -0500
   318.3 @@ -18,7 +18,7 @@
   318.4       misrepresented as being the original software.
   318.5    3. This notice may not be removed or altered from any source distribution.
   318.6  */
   318.7 -#include "SDL_config.h"
   318.8 +#include "../../SDL_internal.h"
   318.9  
  318.10  #if SDL_VIDEO_DRIVER_WINDOWS
  318.11  
   319.1 --- a/src/video/windows/SDL_windowskeyboard.h	Mon Dec 09 13:30:35 2013 -0500
   319.2 +++ b/src/video/windows/SDL_windowskeyboard.h	Sun Nov 24 23:56:17 2013 -0500
   319.3 @@ -18,7 +18,7 @@
   319.4       misrepresented as being the original software.
   319.5    3. This notice may not be removed or altered from any source distribution.
   319.6  */
   319.7 -#include "SDL_config.h"
   319.8 +#include "../../SDL_internal.h"
   319.9  
  319.10  #ifndef _SDL_windowskeyboard_h
  319.11  #define _SDL_windowskeyboard_h
   320.1 --- a/src/video/windows/SDL_windowsmessagebox.c	Mon Dec 09 13:30:35 2013 -0500
   320.2 +++ b/src/video/windows/SDL_windowsmessagebox.c	Sun Nov 24 23:56:17 2013 -0500
   320.3 @@ -18,7 +18,7 @@
   320.4       misrepresented as being the original software.
   320.5    3. This notice may not be removed or altered from any source distribution.
   320.6  */
   320.7 -#include "SDL_config.h"
   320.8 +#include "../../SDL_internal.h"
   320.9  
  320.10  #if SDL_VIDEO_DRIVER_WINDOWS
  320.11  
   321.1 --- a/src/video/windows/SDL_windowsmessagebox.h	Mon Dec 09 13:30:35 2013 -0500
   321.2 +++ b/src/video/windows/SDL_windowsmessagebox.h	Sun Nov 24 23:56:17 2013 -0500
   321.3 @@ -18,7 +18,7 @@
   321.4       misrepresented as being the original software.
   321.5    3. This notice may not be removed or altered from any source distribution.
   321.6  */
   321.7 -#include "SDL_config.h"
   321.8 +#include "../../SDL_internal.h"
   321.9  
  321.10  #if SDL_VIDEO_DRIVER_WINDOWS
  321.11  
   322.1 --- a/src/video/windows/SDL_windowsmodes.c	Mon Dec 09 13:30:35 2013 -0500
   322.2 +++ b/src/video/windows/SDL_windowsmodes.c	Sun Nov 24 23:56:17 2013 -0500
   322.3 @@ -18,7 +18,7 @@
   322.4       misrepresented as being the original software.
   322.5    3. This notice may not be removed or altered from any source distribution.
   322.6  */
   322.7 -#include "SDL_config.h"
   322.8 +#include "../../SDL_internal.h"
   322.9  
  322.10  #if SDL_VIDEO_DRIVER_WINDOWS
  322.11  
   323.1 --- a/src/video/windows/SDL_windowsmodes.h	Mon Dec 09 13:30:35 2013 -0500
   323.2 +++ b/src/video/windows/SDL_windowsmodes.h	Sun Nov 24 23:56:17 2013 -0500
   323.3 @@ -18,7 +18,7 @@
   323.4       misrepresented as being the original software.
   323.5    3. This notice may not be removed or altered from any source distribution.
   323.6  */
   323.7 -#include "SDL_config.h"
   323.8 +#include "../../SDL_internal.h"
   323.9  
  323.10  #ifndef _SDL_windowsmodes_h
  323.11  #define _SDL_windowsmodes_h
   324.1 --- a/src/video/windows/SDL_windowsmouse.c	Mon Dec 09 13:30:35 2013 -0500
   324.2 +++ b/src/video/windows/SDL_windowsmouse.c	Sun Nov 24 23:56:17 2013 -0500
   324.3 @@ -18,7 +18,7 @@
   324.4       misrepresented as being the original software.
   324.5    3. This notice may not be removed or altered from any source distribution.
   324.6  */
   324.7 -#include "SDL_config.h"
   324.8 +#include "../../SDL_internal.h"
   324.9  
  324.10  #if SDL_VIDEO_DRIVER_WINDOWS
  324.11  
   325.1 --- a/src/video/windows/SDL_windowsmouse.h	Mon Dec 09 13:30:35 2013 -0500
   325.2 +++ b/src/video/windows/SDL_windowsmouse.h	Sun Nov 24 23:56:17 2013 -0500
   325.3 @@ -18,7 +18,7 @@
   325.4       misrepresented as being the original software.
   325.5    3. This notice may not be removed or altered from any source distribution.
   325.6  */
   325.7 -#include "SDL_config.h"
   325.8 +#include "../../SDL_internal.h"
   325.9  
  325.10  #ifndef _SDL_windowsmouse_h
  325.11  #define _SDL_windowsmouse_h
   326.1 --- a/src/video/windows/SDL_windowsopengl.c	Mon Dec 09 13:30:35 2013 -0500
   326.2 +++ b/src/video/windows/SDL_windowsopengl.c	Sun Nov 24 23:56:17 2013 -0500
   326.3 @@ -18,7 +18,7 @@
   326.4       misrepresented as being the original software.
   326.5    3. This notice may not be removed or altered from any source distribution.
   326.6  */
   326.7 -#include "SDL_config.h"
   326.8 +#include "../../SDL_internal.h"
   326.9  
  326.10  #if SDL_VIDEO_DRIVER_WINDOWS
  326.11  
   327.1 --- a/src/video/windows/SDL_windowsopengl.h	Mon Dec 09 13:30:35 2013 -0500
   327.2 +++ b/src/video/windows/SDL_windowsopengl.h	Sun Nov 24 23:56:17 2013 -0500
   327.3 @@ -18,7 +18,7 @@
   327.4       misrepresented as being the original software.
   327.5    3. This notice may not be removed or altered from any source distribution.
   327.6  */
   327.7 -#include "SDL_config.h"
   327.8 +#include "../../SDL_internal.h"
   327.9  
  327.10  #ifndef _SDL_windowsopengl_h
  327.11  #define _SDL_windowsopengl_h
   328.1 --- a/src/video/windows/SDL_windowsopengles.c	Mon Dec 09 13:30:35 2013 -0500
   328.2 +++ b/src/video/windows/SDL_windowsopengles.c	Sun Nov 24 23:56:17 2013 -0500
   328.3 @@ -18,7 +18,7 @@
   328.4       misrepresented as being the original software.
   328.5    3. This notice may not be removed or altered from any source distribution.
   328.6  */
   328.7 -#include "SDL_config.h"
   328.8 +#include "../../SDL_internal.h"
   328.9  
  328.10  #if SDL_VIDEO_DRIVER_WINDOWS && SDL_VIDEO_OPENGL_EGL
  328.11  
   329.1 --- a/src/video/windows/SDL_windowsopengles.h	Mon Dec 09 13:30:35 2013 -0500
   329.2 +++ b/src/video/windows/SDL_windowsopengles.h	Sun Nov 24 23:56:17 2013 -0500
   329.3 @@ -18,7 +18,7 @@
   329.4       misrepresented as being the original software.
   329.5    3. This notice may not be removed or altered from any source distribution.
   329.6  */
   329.7 -#include "SDL_config.h"
   329.8 +#include "../../SDL_internal.h"
   329.9  
  329.10  #ifndef _SDL_winopengles_h
  329.11  #define _SDL_winopengles_h
   330.1 --- a/src/video/windows/SDL_windowsshape.c	Mon Dec 09 13:30:35 2013 -0500
   330.2 +++ b/src/video/windows/SDL_windowsshape.c	Sun Nov 24 23:56:17 2013 -0500
   330.3 @@ -18,7 +18,7 @@
   330.4       misrepresented as being the original software.
   330.5    3. This notice may not be removed or altered from any source distribution.
   330.6  */
   330.7 -#include "SDL_config.h"
   330.8 +#include "../../SDL_internal.h"
   330.9  
  330.10  #if SDL_VIDEO_DRIVER_WINDOWS
  330.11  
   331.1 --- a/src/video/windows/SDL_windowsshape.h	Mon Dec 09 13:30:35 2013 -0500
   331.2 +++ b/src/video/windows/SDL_windowsshape.h	Sun Nov 24 23:56:17 2013 -0500
   331.3 @@ -19,7 +19,7 @@
   331.4    3. This notice may not be removed or altered from any source distribution.
   331.5  */
   331.6  
   331.7 -#include "SDL_config.h"
   331.8 +#include "../../SDL_internal.h"
   331.9  
  331.10  #ifndef _SDL_windowsshape_h
  331.11  #define _SDL_windowsshape_h
   332.1 --- a/src/video/windows/SDL_windowsvideo.c	Mon Dec 09 13:30:35 2013 -0500
   332.2 +++ b/src/video/windows/SDL_windowsvideo.c	Sun Nov 24 23:56:17 2013 -0500
   332.3 @@ -18,7 +18,7 @@
   332.4       misrepresented as being the original software.
   332.5    3. This notice may not be removed or altered from any source distribution.
   332.6  */
   332.7 -#include "SDL_config.h"
   332.8 +#include "../../SDL_internal.h"
   332.9  
  332.10  #if SDL_VIDEO_DRIVER_WINDOWS
  332.11  
   333.1 --- a/src/video/windows/SDL_windowsvideo.h	Mon Dec 09 13:30:35 2013 -0500
   333.2 +++ b/src/video/windows/SDL_windowsvideo.h	Sun Nov 24 23:56:17 2013 -0500
   333.3 @@ -18,7 +18,7 @@
   333.4       misrepresented as being the original software.
   333.5    3. This notice may not be removed or altered from any source distribution.
   333.6  */
   333.7 -#include "SDL_config.h"
   333.8 +#include "../../SDL_internal.h"
   333.9  
  333.10  #ifndef _SDL_windowsvideo_h
  333.11  #define _SDL_windowsvideo_h
   334.1 --- a/src/video/windows/SDL_windowswindow.c	Mon Dec 09 13:30:35 2013 -0500
   334.2 +++ b/src/video/windows/SDL_windowswindow.c	Sun Nov 24 23:56:17 2013 -0500
   334.3 @@ -18,7 +18,7 @@
   334.4       misrepresented as being the original software.
   334.5    3. This notice may not be removed or altered from any source distribution.
   334.6  */
   334.7 -#include "SDL_config.h"
   334.8 +#include "../../SDL_internal.h"
   334.9  
  334.10  #if SDL_VIDEO_DRIVER_WINDOWS
  334.11  
   335.1 --- a/src/video/windows/SDL_windowswindow.h	Mon Dec 09 13:30:35 2013 -0500
   335.2 +++ b/src/video/windows/SDL_windowswindow.h	Sun Nov 24 23:56:17 2013 -0500
   335.3 @@ -18,7 +18,7 @@
   335.4       misrepresented as being the original software.
   335.5    3. This notice may not be removed or altered from any source distribution.
   335.6  */
   335.7 -#include "SDL_config.h"
   335.8 +#include "../../SDL_internal.h"
   335.9  
  335.10  #ifndef _SDL_windowswindow_h
  335.11  #define _SDL_windowswindow_h
   336.1 --- a/src/video/x11/SDL_x11clipboard.c	Mon Dec 09 13:30:35 2013 -0500
   336.2 +++ b/src/video/x11/SDL_x11clipboard.c	Sun Nov 24 23:56:17 2013 -0500
   336.3 @@ -18,7 +18,7 @@
   336.4       misrepresented as being the original software.
   336.5    3. This notice may not be removed or altered from any source distribution.
   336.6  */
   336.7 -#include "SDL_config.h"
   336.8 +#include "../../SDL_internal.h"
   336.9  
  336.10  #if SDL_VIDEO_DRIVER_X11
  336.11  
   337.1 --- a/src/video/x11/SDL_x11clipboard.h	Mon Dec 09 13:30:35 2013 -0500
   337.2 +++ b/src/video/x11/SDL_x11clipboard.h	Sun Nov 24 23:56:17 2013 -0500
   337.3 @@ -18,7 +18,7 @@
   337.4       misrepresented as being the original software.
   337.5    3. This notice may not be removed or altered from any source distribution.
   337.6  */
   337.7 -#include "SDL_config.h"
   337.8 +#include "../../SDL_internal.h"
   337.9  
  337.10  #ifndef _SDL_x11clipboard_h
  337.11  #define _SDL_x11clipboard_h
   338.1 --- a/src/video/x11/SDL_x11dyn.c	Mon Dec 09 13:30:35 2013 -0500
   338.2 +++ b/src/video/x11/SDL_x11dyn.c	Sun Nov 24 23:56:17 2013 -0500
   338.3 @@ -18,7 +18,7 @@
   338.4       misrepresented as being the original software.
   338.5    3. This notice may not be removed or altered from any source distribution.
   338.6  */
   338.7 -#include "SDL_config.h"
   338.8 +#include "../../SDL_internal.h"
   338.9  
  338.10  #if SDL_VIDEO_DRIVER_X11
  338.11  
   339.1 --- a/src/video/x11/SDL_x11dyn.h	Mon Dec 09 13:30:35 2013 -0500
   339.2 +++ b/src/video/x11/SDL_x11dyn.h	Sun Nov 24 23:56:17 2013 -0500
   339.3 @@ -18,7 +18,7 @@
   339.4       misrepresented as being the original software.
   339.5    3. This notice may not be removed or altered from any source distribution.
   339.6  */
   339.7 -#include "SDL_config.h"
   339.8 +#include "../../SDL_internal.h"
   339.9  
  339.10  #ifndef _SDL_x11dyn_h
  339.11  #define _SDL_x11dyn_h
   340.1 --- a/src/video/x11/SDL_x11events.c	Mon Dec 09 13:30:35 2013 -0500
   340.2 +++ b/src/video/x11/SDL_x11events.c	Sun Nov 24 23:56:17 2013 -0500
   340.3 @@ -18,7 +18,7 @@
   340.4       misrepresented as being the original software.
   340.5    3. This notice may not be removed or altered from any source distribution.
   340.6  */
   340.7 -#include "SDL_config.h"
   340.8 +#include "../../SDL_internal.h"
   340.9  
  340.10  #if SDL_VIDEO_DRIVER_X11
  340.11  
   341.1 --- a/src/video/x11/SDL_x11events.h	Mon Dec 09 13:30:35 2013 -0500
   341.2 +++ b/src/video/x11/SDL_x11events.h	Sun Nov 24 23:56:17 2013 -0500
   341.3 @@ -18,7 +18,7 @@
   341.4       misrepresented as being the original software.
   341.5    3. This notice may not be removed or altered from any source distribution.
   341.6  */
   341.7 -#include "SDL_config.h"
   341.8 +#include "../../SDL_internal.h"
   341.9  
  341.10  #ifndef _SDL_x11events_h
  341.11  #define _SDL_x11events_h
   342.1 --- a/src/video/x11/SDL_x11framebuffer.c	Mon Dec 09 13:30:35 2013 -0500
   342.2 +++ b/src/video/x11/SDL_x11framebuffer.c	Sun Nov 24 23:56:17 2013 -0500
   342.3 @@ -18,7 +18,7 @@
   342.4       misrepresented as being the original software.
   342.5    3. This notice may not be removed or altered from any source distribution.
   342.6  */
   342.7 -#include "SDL_config.h"
   342.8 +#include "../../SDL_internal.h"
   342.9  
  342.10  #if SDL_VIDEO_DRIVER_X11
  342.11  
   343.1 --- a/src/video/x11/SDL_x11framebuffer.h	Mon Dec 09 13:30:35 2013 -0500
   343.2 +++ b/src/video/x11/SDL_x11framebuffer.h	Sun Nov 24 23:56:17 2013 -0500
   343.3 @@ -18,7 +18,7 @@
   343.4       misrepresented as being the original software.
   343.5    3. This notice may not be removed or altered from any source distribution.
   343.6  */
   343.7 -#include "SDL_config.h"
   343.8 +#include "../../SDL_internal.h"
   343.9  
  343.10  
  343.11  extern int X11_CreateWindowFramebuffer(_THIS, SDL_Window * window,
   344.1 --- a/src/video/x11/SDL_x11keyboard.c	Mon Dec 09 13:30:35 2013 -0500
   344.2 +++ b/src/video/x11/SDL_x11keyboard.c	Sun Nov 24 23:56:17 2013 -0500
   344.3 @@ -18,7 +18,7 @@
   344.4       misrepresented as being the original software.
   344.5    3. This notice may not be removed or altered from any source distribution.
   344.6  */
   344.7 -#include "SDL_config.h"
   344.8 +#include "../../SDL_internal.h"
   344.9  
  344.10  #if SDL_VIDEO_DRIVER_X11
  344.11  
   345.1 --- a/src/video/x11/SDL_x11keyboard.h	Mon Dec 09 13:30:35 2013 -0500
   345.2 +++ b/src/video/x11/SDL_x11keyboard.h	Sun Nov 24 23:56:17 2013 -0500
   345.3 @@ -18,7 +18,7 @@
   345.4       misrepresented as being the original software.
   345.5    3. This notice may not be removed or altered from any source distribution.
   345.6  */
   345.7 -#include "SDL_config.h"
   345.8 +#include "../../SDL_internal.h"
   345.9  
  345.10  #ifndef _SDL_x11keyboard_h
  345.11  #define _SDL_x11keyboard_h
   346.1 --- a/src/video/x11/SDL_x11messagebox.c	Mon Dec 09 13:30:35 2013 -0500
   346.2 +++ b/src/video/x11/SDL_x11messagebox.c	Sun Nov 24 23:56:17 2013 -0500
   346.3 @@ -19,7 +19,7 @@
   346.4    3. This notice may not be removed or altered from any source distribution.
   346.5  */
   346.6  
   346.7 -#include "SDL_config.h"
   346.8 +#include "../../SDL_internal.h"
   346.9  
  346.10  #if SDL_VIDEO_DRIVER_X11
  346.11  
   347.1 --- a/src/video/x11/SDL_x11modes.c	Mon Dec 09 13:30:35 2013 -0500
   347.2 +++ b/src/video/x11/SDL_x11modes.c	Sun Nov 24 23:56:17 2013 -0500
   347.3 @@ -18,7 +18,7 @@
   347.4       misrepresented as being the original software.
   347.5    3. This notice may not be removed or altered from any source distribution.
   347.6  */
   347.7 -#include "SDL_config.h"
   347.8 +#include "../../SDL_internal.h"
   347.9  
  347.10  #if SDL_VIDEO_DRIVER_X11
  347.11  
   348.1 --- a/src/video/x11/SDL_x11modes.h	Mon Dec 09 13:30:35 2013 -0500
   348.2 +++ b/src/video/x11/SDL_x11modes.h	Sun Nov 24 23:56:17 2013 -0500
   348.3 @@ -18,7 +18,7 @@
   348.4       misrepresented as being the original software.
   348.5    3. This notice may not be removed or altered from any source distribution.
   348.6  */
   348.7 -#include "SDL_config.h"
   348.8 +#include "../../SDL_internal.h"
   348.9  
  348.10  #ifndef _SDL_x11modes_h
  348.11  #define _SDL_x11modes_h
   349.1 --- a/src/video/x11/SDL_x11mouse.c	Mon Dec 09 13:30:35 2013 -0500
   349.2 +++ b/src/video/x11/SDL_x11mouse.c	Sun Nov 24 23:56:17 2013 -0500
   349.3 @@ -18,7 +18,7 @@
   349.4       misrepresented as being the original software.
   349.5    3. This notice may not be removed or altered from any source distribution.
   349.6  */
   349.7 -#include "SDL_config.h"
   349.8 +#include "../../SDL_internal.h"
   349.9  
  349.10  #if SDL_VIDEO_DRIVER_X11
  349.11  
   350.1 --- a/src/video/x11/SDL_x11mouse.h	Mon Dec 09 13:30:35 2013 -0500
   350.2 +++ b/src/video/x11/SDL_x11mouse.h	Sun Nov 24 23:56:17 2013 -0500
   350.3 @@ -18,7 +18,7 @@
   350.4       misrepresented as being the original software.
   350.5    3. This notice may not be removed or altered from any source distribution.
   350.6  */
   350.7 -#include "SDL_config.h"
   350.8 +#include "../../SDL_internal.h"
   350.9  
  350.10  #ifndef _SDL_x11mouse_h
  350.11  #define _SDL_x11mouse_h
   351.1 --- a/src/video/x11/SDL_x11opengl.c	Mon Dec 09 13:30:35 2013 -0500
   351.2 +++ b/src/video/x11/SDL_x11opengl.c	Sun Nov 24 23:56:17 2013 -0500
   351.3 @@ -18,7 +18,7 @@
   351.4       misrepresented as being the original software.
   351.5    3. This notice may not be removed or altered from any source distribution.
   351.6  */
   351.7 -#include "SDL_config.h"
   351.8 +#include "../../SDL_internal.h"
   351.9  
  351.10  #if SDL_VIDEO_DRIVER_X11
  351.11  
   352.1 --- a/src/video/x11/SDL_x11opengl.h	Mon Dec 09 13:30:35 2013 -0500
   352.2 +++ b/src/video/x11/SDL_x11opengl.h	Sun Nov 24 23:56:17 2013 -0500
   352.3 @@ -18,7 +18,7 @@
   352.4       misrepresented as being the original software.
   352.5    3. This notice may not be removed or altered from any source distribution.
   352.6  */
   352.7 -#include "SDL_config.h"
   352.8 +#include "../../SDL_internal.h"
   352.9  
  352.10  #ifndef _SDL_x11opengl_h
  352.11  #define _SDL_x11opengl_h
   353.1 --- a/src/video/x11/SDL_x11opengles.c	Mon Dec 09 13:30:35 2013 -0500
   353.2 +++ b/src/video/x11/SDL_x11opengles.c	Sun Nov 24 23:56:17 2013 -0500
   353.3 @@ -18,7 +18,7 @@
   353.4       misrepresented as being the original software.
   353.5    3. This notice may not be removed or altered from any source distribution.
   353.6  */
   353.7 -#include "SDL_config.h"
   353.8 +#include "../../SDL_internal.h"
   353.9  
  353.10  #if SDL_VIDEO_DRIVER_X11 && SDL_VIDEO_OPENGL_EGL
  353.11  
   354.1 --- a/src/video/x11/SDL_x11opengles.h	Mon Dec 09 13:30:35 2013 -0500
   354.2 +++ b/src/video/x11/SDL_x11opengles.h	Sun Nov 24 23:56:17 2013 -0500
   354.3 @@ -18,7 +18,7 @@
   354.4       misrepresented as being the original software.
   354.5    3. This notice may not be removed or altered from any source distribution.
   354.6  */
   354.7 -#include "SDL_config.h"
   354.8 +#include "../../SDL_internal.h"
   354.9  
  354.10  #ifndef _SDL_x11opengles_h
  354.11  #define _SDL_x11opengles_h
   355.1 --- a/src/video/x11/SDL_x11shape.c	Mon Dec 09 13:30:35 2013 -0500
   355.2 +++ b/src/video/x11/SDL_x11shape.c	Sun Nov 24 23:56:17 2013 -0500
   355.3 @@ -18,7 +18,7 @@
   355.4       misrepresented as being the original software.
   355.5    3. This notice may not be removed or altered from any source distribution.
   355.6  */
   355.7 -#include "SDL_config.h"
   355.8 +#include "../../SDL_internal.h"
   355.9  
  355.10  #if SDL_VIDEO_DRIVER_X11
  355.11  
   356.1 --- a/src/video/x11/SDL_x11shape.h	Mon Dec 09 13:30:35 2013 -0500
   356.2 +++ b/src/video/x11/SDL_x11shape.h	Sun Nov 24 23:56:17 2013 -0500
   356.3 @@ -18,7 +18,7 @@
   356.4       misrepresented as being the original software.
   356.5    3. This notice may not be removed or altered from any source distribution.
   356.6  */
   356.7 -#include "SDL_config.h"
   356.8 +#include "../../SDL_internal.h"
   356.9  
  356.10  #ifndef _SDL_x11shape_h
  356.11  #define _SDL_x11shape_h
   357.1 --- a/src/video/x11/SDL_x11touch.c	Mon Dec 09 13:30:35 2013 -0500
   357.2 +++ b/src/video/x11/SDL_x11touch.c	Sun Nov 24 23:56:17 2013 -0500
   357.3 @@ -18,7 +18,7 @@
   357.4       misrepresented as being the original software.
   357.5    3. This notice may not be removed or altered from any source distribution.
   357.6  */
   357.7 -#include "SDL_config.h"
   357.8 +#include "../../SDL_internal.h"
   357.9  
  357.10  #if SDL_VIDEO_DRIVER_X11
  357.11  
   358.1 --- a/src/video/x11/SDL_x11touch.h	Mon Dec 09 13:30:35 2013 -0500
   358.2 +++ b/src/video/x11/SDL_x11touch.h	Sun Nov 24 23:56:17 2013 -0500
   358.3 @@ -18,7 +18,7 @@
   358.4       misrepresented as being the original software.
   358.5    3. This notice may not be removed or altered from any source distribution.
   358.6  */
   358.7 -#include "SDL_config.h"
   358.8 +#include "../../SDL_internal.h"
   358.9  
  358.10  #ifndef _SDL_x11touch_h
  358.11  #define _SDL_x11touch_h
   359.1 --- a/src/video/x11/SDL_x11video.c	Mon Dec 09 13:30:35 2013 -0500
   359.2 +++ b/src/video/x11/SDL_x11video.c	Sun Nov 24 23:56:17 2013 -0500
   359.3 @@ -18,7 +18,7 @@
   359.4       misrepresented as being the original software.
   359.5    3. This notice may not be removed or altered from any source distribution.
   359.6  */
   359.7 -#include "SDL_config.h"
   359.8 +#include "../../SDL_internal.h"
   359.9  
  359.10  #if SDL_VIDEO_DRIVER_X11
  359.11  
   360.1 --- a/src/video/x11/SDL_x11video.h	Mon Dec 09 13:30:35 2013 -0500
   360.2 +++ b/src/video/x11/SDL_x11video.h	Sun Nov 24 23:56:17 2013 -0500
   360.3 @@ -18,7 +18,7 @@
   360.4       misrepresented as being the original software.
   360.5    3. This notice may not be removed or altered from any source distribution.
   360.6  */
   360.7 -#include "SDL_config.h"
   360.8 +#include "../../SDL_internal.h"
   360.9  
  360.10  #ifndef _SDL_x11video_h
  360.11  #define _SDL_x11video_h
   361.1 --- a/src/video/x11/SDL_x11window.c	Mon Dec 09 13:30:35 2013 -0500
   361.2 +++ b/src/video/x11/SDL_x11window.c	Sun Nov 24 23:56:17 2013 -0500
   361.3 @@ -18,7 +18,7 @@
   361.4       misrepresented as being the original software.
   361.5    3. This notice may not be removed or altered from any source distribution.
   361.6  */
   361.7 -#include "SDL_config.h"
   361.8 +#include "../../SDL_internal.h"
   361.9  
  361.10  #if SDL_VIDEO_DRIVER_X11
  361.11  
   362.1 --- a/src/video/x11/SDL_x11window.h	Mon Dec 09 13:30:35 2013 -0500
   362.2 +++ b/src/video/x11/SDL_x11window.h	Sun Nov 24 23:56:17 2013 -0500
   362.3 @@ -18,7 +18,7 @@
   362.4       misrepresented as being the original software.
   362.5    3. This notice may not be removed or altered from any source distribution.
   362.6  */
   362.7 -#include "SDL_config.h"
   362.8 +#include "../../SDL_internal.h"
   362.9  
  362.10  #ifndef _SDL_x11window_h
  362.11  #define _SDL_x11window_h
   363.1 --- a/src/video/x11/SDL_x11xinput2.c	Mon Dec 09 13:30:35 2013 -0500
   363.2 +++ b/src/video/x11/SDL_x11xinput2.c	Sun Nov 24 23:56:17 2013 -0500
   363.3 @@ -18,7 +18,7 @@
   363.4       misrepresented as being the original software.
   363.5    3. This notice may not be removed or altered from any source distribution.
   363.6  */
   363.7 -#include "SDL_config.h"
   363.8 +#include "../../SDL_internal.h"
   363.9  
  363.10  #if SDL_VIDEO_DRIVER_X11
  363.11  
   364.1 --- a/src/video/x11/SDL_x11xinput2.h	Mon Dec 09 13:30:35 2013 -0500
   364.2 +++ b/src/video/x11/SDL_x11xinput2.h	Sun Nov 24 23:56:17 2013 -0500
   364.3 @@ -18,7 +18,7 @@
   364.4       misrepresented as being the original software.
   364.5    3. This notice may not be removed or altered from any source distribution.
   364.6  */
   364.7 -#include "SDL_config.h"
   364.8 +#include "../../SDL_internal.h"
   364.9  
  364.10  #ifndef _SDL_x11xinput2_h
  364.11  #define _SDL_x11xinput2_h
   365.1 --- a/src/video/x11/imKStoUCS.c	Mon Dec 09 13:30:35 2013 -0500
   365.2 +++ b/src/video/x11/imKStoUCS.c	Sun Nov 24 23:56:17 2013 -0500
   365.3 @@ -22,7 +22,7 @@
   365.4  ings in this Software without prior written authorization from the XFree86
   365.5  Project.
   365.6  */
   365.7 -#include "SDL_config.h"
   365.8 +#include "../../SDL_internal.h"
   365.9  
  365.10  #if SDL_VIDEO_DRIVER_X11
  365.11