diff --git a/SDL2-CS.csproj b/SDL2-CS.csproj
index 84c2fc57..5bddfaf6 100644
--- a/SDL2-CS.csproj
+++ b/SDL2-CS.csproj
@@ -77,9 +77,6 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Compile Include="src\SDL2.cs" />
-    <Compile Include="src\SDL2_image.cs" />
-    <Compile Include="src\SDL2_mixer.cs" />
-    <Compile Include="src\SDL2_ttf.cs" />
     <Compile Include="src\LPUtf8StrMarshaler.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/SDL2_image.cs b/src/SDL2_image.cs
deleted file mode 100644
index e57c1b79..00000000
--- a/src/SDL2_image.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-#region License
-/* SDL2# - C# Wrapper for SDL2
- *
- * Copyright (c) 2013-2015 Ethan Lee.
- *
- * This software is provided 'as-is', without any express or implied warranty.
- * In no event will the authors be held liable for any damages arising from
- * the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software in a
- * product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- *
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- *
- * 3. This notice may not be removed or altered from any source distribution.
- *
- * Ethan "flibitijibibo" Lee <flibitijibibo@flibitijibibo.com>
- *
- */
-#endregion
-
-#region Using Statements
-using System;
-using System.Runtime.InteropServices;
-#endregion
-
-namespace SDL2
-{
-	public static class SDL_image
-	{
-		#region SDL2# Variables
-
-		/* Used by DllImport to load the native library. */
-		private const string nativeLibName = "SDL2_image.dll";
-
-		#endregion
-
-		#region SDL_image.h
-
-		/* Similar to the headers, this is the version we're expecting to be
-		 * running with. You will likely want to check this somewhere in your
-		 * program!
-		 */
-		public const int SDL_IMAGE_MAJOR_VERSION =	2;
-		public const int SDL_IMAGE_MINOR_VERSION =	0;
-		public const int SDL_IMAGE_PATCHLEVEL =		0;
-
-		[Flags]
-		public enum IMG_InitFlags
-		{
-			IMG_INIT_JPG =	0x00000001,
-			IMG_INIT_PNG =	0x00000002,
-			IMG_INIT_TIF =	0x00000004,
-			IMG_INIT_WEBP =	0x00000008
-		}
-
-		public static void SDL_IMAGE_VERSION(out SDL.SDL_version X)
-		{
-			X.major = SDL_IMAGE_MAJOR_VERSION;
-			X.minor = SDL_IMAGE_MINOR_VERSION;
-			X.patch = SDL_IMAGE_PATCHLEVEL;
-		}
-
-		[DllImport(nativeLibName, EntryPoint = "IMG_LinkedVersion", CallingConvention = CallingConvention.Cdecl)]
-		private static extern IntPtr INTERNAL_IMG_LinkedVersion();
-		public static SDL.SDL_version IMG_LinkedVersion()
-		{
-			SDL.SDL_version result;
-			IntPtr result_ptr = INTERNAL_IMG_LinkedVersion();
-			result = (SDL.SDL_version) Marshal.PtrToStructure(
-				result_ptr,
-				typeof(SDL.SDL_version)
-			);
-			return result;
-		}
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int IMG_Init(IMG_InitFlags flags);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void IMG_Quit();
-
-		/* IntPtr refers to an SDL_Surface* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr IMG_Load(
-			[In()] [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler))]
-				string file
-		);
-
-		/* src refers to an SDL_RWops*, IntPtr to an SDL_Surface* */
-		/* THIS IS A PUBLIC RWops FUNCTION! */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr IMG_Load_RW(
-			IntPtr src,
-			int freesrc
-		);
-
-		/* src refers to an SDL_RWops*, IntPtr to an SDL_Surface* */
-		/* THIS IS A PUBLIC RWops FUNCTION! */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr IMG_LoadTyped_RW(
-			IntPtr src,
-			int freesrc,
-			[In()] [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler))]
-				string type
-		);
-
-		/* IntPtr refers to an SDL_Texture*, renderer to an SDL_Renderer* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr IMG_LoadTexture(
-			IntPtr renderer,
-			[In()] [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler))]
-				string file
-		);
-
-		/* renderer refers to an SDL_Renderer*.
-		 * src refers to an SDL_RWops*.
-		 * IntPtr to an SDL_Texture*.
-		 */
-		/* THIS IS A PUBLIC RWops FUNCTION! */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr IMG_LoadTexture_RW(
-			IntPtr renderer,
-			IntPtr src,
-			int freesrc
-		);
-
-		/* renderer refers to an SDL_Renderer*.
-		 * src refers to an SDL_RWops*.
-		 * IntPtr to an SDL_Texture*.
-		 */
-		/* THIS IS A PUBLIC RWops FUNCTION! */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr IMG_LoadTextureTyped_RW(
-			IntPtr renderer,
-			IntPtr src,
-			int freesrc,
-			[In()] [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler))]
-				string type
-		);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int IMG_InvertAlpha(int on);
-
-		/* IntPtr refers to an SDL_Surface* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr IMG_ReadXPMFromArray(
-			[In()] [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.LPStr)]
-				string[] xpm
-		);
-
-		/* surface refers to an SDL_Surface* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int IMG_SavePNG(
-			IntPtr surface,
-			[In()] [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler))]
-				string file
-		);
-
-		/* surface refers to an SDL_Surface*, dst to an SDL_RWops* */
-		/* THIS IS A PUBLIC RWops FUNCTION! */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int IMG_SavePNG_RW(
-			IntPtr surface,
-			IntPtr dst,
-			int freedst
-		);
-
-		#endregion
-	}
-}
diff --git a/src/SDL2_mixer.cs b/src/SDL2_mixer.cs
deleted file mode 100644
index 193c6df4..00000000
--- a/src/SDL2_mixer.cs
+++ /dev/null
@@ -1,489 +0,0 @@
-#region License
-/* SDL2# - C# Wrapper for SDL2
- *
- * Copyright (c) 2013-2015 Ethan Lee.
- *
- * This software is provided 'as-is', without any express or implied warranty.
- * In no event will the authors be held liable for any damages arising from
- * the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software in a
- * product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- *
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- *
- * 3. This notice may not be removed or altered from any source distribution.
- *
- * Ethan "flibitijibibo" Lee <flibitijibibo@flibitijibibo.com>
- *
- */
-#endregion
-
-#region Using Statements
-using System;
-using System.Runtime.InteropServices;
-#endregion
-
-namespace SDL2
-{
-	public static class SDL_mixer
-	{
-		#region SDL2# Variables
-
-		/* Used by DllImport to load the native library. */
-		private const string nativeLibName = "SDL2_mixer.dll";
-
-		#endregion
-
-		#region SDL_mixer.h
-
-		/* Similar to the headers, this is the version we're expecting to be
-		 * running with. You will likely want to check this somewhere in your
-		 * program!
-		 */
-		public const int SDL_MIXER_MAJOR_VERSION =	2;
-		public const int SDL_MIXER_MINOR_VERSION =	0;
-		public const int SDL_MIXER_PATCHLEVEL =		0;
-
-		/* In C, you can redefine this value before including SDL_mixer.h.
-		 * We're not going to allow this in SDL2#, since the value of this
-		 * variable is persistent and not dependent on preprocessor ordering.
-		 */
-		public const int MIX_CHANNELS = 8;
-
-		public static readonly int MIX_DEFAULT_FREQUENCY = 22050;
-		public static readonly ushort MIX_DEFAULT_FORMAT =
-			BitConverter.IsLittleEndian ? SDL.AUDIO_S16LSB : SDL.AUDIO_S16MSB;
-		public static readonly int MIX_DEFAULT_CHANNELS = 2;
-		public static readonly byte MIX_MAX_VOLUME = 128;
-
-		[Flags]
-		public enum MIX_InitFlags
-		{
-			MIX_INIT_FLAC =		0x00000001,
-			MIX_INIT_MOD =		0x00000002,
-			MIX_INIT_MP3 =		0x00000004,
-			MIX_INIT_OGG =		0x00000008,
-			MIX_INIT_FLUIDSYNTH =	0x00000010,
-		}
-
-		public enum Mix_Fading
-		{
-			MIX_NO_FADING,
-			MIX_FADING_OUT,
-			MIX_FADING_IN
-		}
-
-		public enum Mix_MusicType
-		{
-			MUS_NONE,
-			MUS_CMD,
-			MUS_WAV,
-			MUS_MOD,
-			MUS_MID,
-			MUS_OGG,
-			MUS_MP3,
-			MUS_MP3_MAD,
-			MUS_FLAC,
-			MUS_MODPLUG
-		}
-
-		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-		public delegate void MixFuncDelegate(
-			IntPtr udata, // void*
-			IntPtr stream, // Uint8*
-			int len
-		);
-
-		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-		public delegate void Mix_EffectFunc_t(
-			int chan,
-			IntPtr stream, // void*
-			int len,
-			IntPtr udata // void*
-		);
-
-		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-		public delegate void Mix_EffectDone_t(
-			int chan,
-			IntPtr udata // void*
-		);
-
-		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-		public delegate void MusicFinishedDelegate();
-
-		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-		public delegate void ChannelFinishedDelegate(int channel);
-
-		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-		public delegate int SoundFontDelegate(
-			IntPtr a, // const char*
-			IntPtr b // void*
-		);
-
-		public static void SDL_MIXER_VERSION(out SDL.SDL_version X)
-		{
-			X.major = SDL_MIXER_MAJOR_VERSION;
-			X.minor = SDL_MIXER_MINOR_VERSION;
-			X.patch = SDL_MIXER_PATCHLEVEL;
-		}
-
-		[DllImport(nativeLibName, EntryPoint = "MIX_Linked_Version", CallingConvention = CallingConvention.Cdecl)]
-		private static extern IntPtr INTERNAL_MIX_Linked_Version();
-		public static SDL.SDL_version MIX_Linked_Version()
-		{
-			SDL.SDL_version result;
-			IntPtr result_ptr = INTERNAL_MIX_Linked_Version();
-			result = (SDL.SDL_version) Marshal.PtrToStructure(
-				result_ptr,
-				typeof(SDL.SDL_version)
-			);
-			return result;
-		}
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_Init(MIX_InitFlags flags);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void Mix_Quit();
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_OpenAudio(
-			int frequency,
-			ushort format,
-			int channels,
-			int chunksize
-		);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_AllocateChannels(int numchans);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_QuerySpec(
-			out int frequency,
-			out ushort format,
-			out int channels
-		);
-
-		/* src refers to an SDL_RWops*, IntPtr to a Mix_Chunk* */
-		/* THIS IS A PUBLIC RWops FUNCTION! */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr Mix_LoadWAV_RW(
-			IntPtr src,
-			int freesrc
-		);
-		
-		/* IntPtr refers to a Mix_Chunk* */
-		/* This is an RWops macro in the C header. */
-		public static IntPtr Mix_LoadWAV(string file)
-		{
-			IntPtr rwops = SDL.INTERNAL_SDL_RWFromFile(file, "rb");
-			return Mix_LoadWAV_RW(rwops, 1);
-		}
-
-		/* IntPtr refers to a Mix_Music* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr Mix_LoadMUS(
-			[In()] [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler))]
-				string file
-		);
-
-		/* IntPtr refers to a Mix_Chunk* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr Mix_QuickLoad_WAV(
-			[In()] [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.U1)]
-				byte[] mem
-		);
-
-		/* IntPtr refers to a Mix_Chunk* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr Mix_QuickLoad_RAW(
-			[In()] [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.U1, SizeParamIndex = 1)]
-				byte[] mem,
-			uint len
-		);
-
-		/* chunk refers to a Mix_Chunk* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void Mix_FreeChunk(IntPtr chunk);
-
-		/* music refers to a Mix_Music* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void Mix_FreeMusic(IntPtr music);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_GetNumChunkDecoders();
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		[return : MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler), MarshalCookie = LPUtf8StrMarshaler.LeaveAllocated)]
-		public static extern string Mix_GetChunkDecoder(int index);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_GetNumMusicDecoders();
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		[return : MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler), MarshalCookie = LPUtf8StrMarshaler.LeaveAllocated)]
-		public static extern string Mix_GetMusicDecoder(int index);
-
-		/* music refers to a Mix_Music* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern Mix_MusicType Mix_GetMusicType(IntPtr music);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void Mix_SetPostMix(
-			MixFuncDelegate mix_func,
-			IntPtr arg // void*
-		);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void Mix_HookMusic(
-			MixFuncDelegate mix_func,
-			IntPtr arg // void*
-		);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void Mix_HookMusicFinished(
-			MusicFinishedDelegate music_finished
-		);
-
-		/* IntPtr refers to a void* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr Mix_GetMusicHookData();
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void Mix_ChannelFinished(
-			ChannelFinishedDelegate channel_finished
-		);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_RegisterEffect(
-			int chan,
-			Mix_EffectFunc_t f,
-			Mix_EffectDone_t d,
-			IntPtr arg // void*
-		);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_UnregisterEffect(
-			int channel,
-			Mix_EffectFunc_t f
-		);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_UnregisterAllEffects(int channel);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_SetPanning(
-			int channel,
-			byte left,
-			byte right
-		);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_SetPosition(
-			int channel,
-			short angle,
-			byte distance
-		);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_SetDistance(int channel, byte distance);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_SetReverseStereo(int channel, int flip);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_ReserveChannels(int num);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_GroupChannel(int which, int tag);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_GroupChannels(int from, int to, int tag);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_GroupAvailable(int tag);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_GroupCount(int tag);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_GroupOldest(int tag);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_GroupNewer(int tag);
-
-		/* chunk refers to a Mix_Chunk* */
-		public static int Mix_PlayChannel(
-			int channel,
-			IntPtr chunk,
-			int loops
-		) {
-			return Mix_PlayChannelTimed(channel, chunk, loops, -1);
-		}
-
-		/* chunk refers to a Mix_Chunk* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_PlayChannelTimed(
-			int channel,
-			IntPtr chunk,
-			int loops,
-			int ticks
-		);
-
-		/* music refers to a Mix_Music* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_PlayMusic(IntPtr music, int loops);
-
-		/* music refers to a Mix_Music* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_FadeInMusic(
-			IntPtr music,
-			int loops,
-			int ms
-		);
-
-		/* music refers to a Mix_Music* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_FadeInMusicPos(
-			IntPtr music,
-			int loops,
-			int ms,
-			double position
-		);
-
-		/* chunk refers to a Mix_Chunk* */
-		public static int Mix_FadeInChannel(
-			int channel,
-			IntPtr chunk,
-			int loops,
-			int ms
-		) {
-			return Mix_FadeInChannelTimed(channel, chunk, loops, ms, -1);
-		}
-
-		/* chunk refers to a Mix_Chunk* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_FadeInChannelTimed(
-			int channel,
-			IntPtr chunk,
-			int loops,
-			int ms,
-			int ticks
-		);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_Volume(int channel, int volume);
-
-		/* chunk refers to a Mix_Chunk* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_VolumeChunk(
-			IntPtr chunk,
-			int volume
-		);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_VolumeMusic(int volume);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_HaltChannel(int channel);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_HaltGroup(int tag);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_HaltMusic();
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_ExpireChannel(int channel, int ticks);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_FadeOutChannel(int which, int ms);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_FadeOutGroup(int tag, int ms);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_FadeOutMusic(int ms);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern Mix_Fading Mix_FadingMusic();
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern Mix_Fading Mix_FadingChannel(int which);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void Mix_Pause(int channel);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void Mix_Resume(int channel);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_Paused(int channel);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void Mix_PauseMusic();
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void Mix_ResumeMusic();
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void Mix_RewindMusic();
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_PausedMusic();
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_SetMusicPosition(double position);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_Playing(int channel);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_PlayingMusic();
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_SetMusicCMD(
-			[In()] [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler))]
-				string command
-		);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_SetSynchroValue(int value);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_GetSynchroValue();
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_SetSoundFonts(
-			[In()] [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler))]
-				string paths
-		);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		[return : MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler), MarshalCookie = LPUtf8StrMarshaler.LeaveAllocated)]
-		public static extern string Mix_GetSoundFonts();
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int Mix_EachSoundFont(
-			SoundFontDelegate function,
-			IntPtr data // void*
-		);
-
-		/* IntPtr refers to a Mix_Chunk* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr Mix_GetChunk(int channel);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void Mix_CloseAudio();
-
-		#endregion
-	}
-}
diff --git a/src/SDL2_ttf.cs b/src/SDL2_ttf.cs
deleted file mode 100644
index ef1cfe33..00000000
--- a/src/SDL2_ttf.cs
+++ /dev/null
@@ -1,406 +0,0 @@
-#region License
-/* SDL2# - C# Wrapper for SDL2
- *
- * Copyright (c) 2013-2015 Ethan Lee.
- *
- * This software is provided 'as-is', without any express or implied warranty.
- * In no event will the authors be held liable for any damages arising from
- * the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software in a
- * product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- *
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- *
- * 3. This notice may not be removed or altered from any source distribution.
- *
- * Ethan "flibitijibibo" Lee <flibitijibibo@flibitijibibo.com>
- *
- */
-#endregion
-
-#region Using Statements
-using System;
-using System.Runtime.InteropServices;
-#endregion
-
-namespace SDL2
-{
-	public static class SDL_ttf
-	{
-		#region SDL2# Variables
-
-		/* Used by DllImport to load the native library. */
-		private const string nativeLibName = "SDL2_ttf.dll";
-
-		#endregion
-
-		#region SDL_ttf.h
-
-		/* Similar to the headers, this is the version we're expecting to be
-		 * running with. You will likely want to check this somewhere in your
-		 * program!
-		 */
-		public const int SDL_TTF_MAJOR_VERSION =	2;
-		public const int SDL_TTF_MINOR_VERSION =	0;
-		public const int SDL_TTF_PATCHLEVEL =		12;
-
-		public const int UNICODE_BOM_NATIVE =	0xFEFF;
-		public const int UNICODE_BOM_SWAPPED =	0xFFFE;
-
-		public const int TTF_STYLE_NORMAL =		0x00;
-		public const int TTF_STYLE_BOLD =		0x01;
-		public const int TTF_STYLE_ITALIC =		0x02;
-		public const int TTF_STYLE_UNDERLINE =		0x04;
-		public const int TTF_STYLE_STRIKETHROUGH =	0x08;
-
-		public const int TTF_HINTING_NORMAL =	0;
-		public const int TTF_HINTING_LIGHT =	1;
-		public const int TTF_HINTING_MONO =	2;
-		public const int TTF_HINTING_NONE =	3;
-
-		public static void SDL_TTF_VERSION(out SDL.SDL_version X)
-		{
-			X.major = SDL_TTF_MAJOR_VERSION;
-			X.minor = SDL_TTF_MINOR_VERSION;
-			X.patch = SDL_TTF_PATCHLEVEL;
-		}
-
-		[DllImport(nativeLibName, EntryPoint = "TTF_LinkedVersion", CallingConvention = CallingConvention.Cdecl)]
-		private static extern IntPtr INTERNAL_TTF_LinkedVersion();
-		public static SDL.SDL_version TTF_LinkedVersion()
-		{
-			SDL.SDL_version result;
-			IntPtr result_ptr = INTERNAL_TTF_LinkedVersion();
-			result = (SDL.SDL_version) Marshal.PtrToStructure(
-				result_ptr,
-				typeof(SDL.SDL_version)
-			);
-			return result;
-		}
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void TTF_ByteSwappedUNICODE(int swapped);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int TTF_Init();
-
-		/* IntPtr refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_OpenFont(
-			[In()] [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler))]
-				string file,
-			int ptsize
-		);
-
-		/* src refers to an SDL_RWops*, IntPtr to a TTF_Font* */
-		/* THIS IS A PUBLIC RWops FUNCTION! */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_OpenFontRW(
-			IntPtr src,
-			int freesrc,
-			int ptsize
-		);
-
-		/* IntPtr refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_OpenFontIndex(
-			[In()] [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler))]
-				string file,
-			int ptsize,
-			long index
-		);
-
-		/* src refers to an SDL_RWops*, IntPtr to a TTF_Font* */
-		/* THIS IS A PUBLIC RWops FUNCTION! */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_OpenFontIndexRW(
-			IntPtr src,
-			int freesrc,
-			int ptsize,
-			long index
-		);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int TTF_GetFontStyle(IntPtr font);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void TTF_SetFontStyle(IntPtr font, int style);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int TTF_GetFontOutline(IntPtr font);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void TTF_SetFontOutline(IntPtr font, int outline);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int TTF_GetFontHinting(IntPtr font);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void TTF_SetFontHinting(IntPtr font, int hinting);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int TTF_FontHeight(IntPtr font);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int TTF_FontAscent(IntPtr font);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int TTF_FontDescent(IntPtr font);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int TTF_FontLineSkip(IntPtr font);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int TTF_GetFontKerning(IntPtr font);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void TTF_SetFontKerning(IntPtr font, int allowed);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern long TTF_FontFaces(IntPtr font);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int TTF_FontFaceIsFixedWidth(IntPtr font);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		[return : MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler), MarshalCookie = LPUtf8StrMarshaler.LeaveAllocated)]
-		public static extern string TTF_FontFaceFamilyName(
-			IntPtr font
-		);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		[return : MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler), MarshalCookie = LPUtf8StrMarshaler.LeaveAllocated)]
-		public static extern string TTF_FontFaceStyleName(
-			IntPtr font
-		);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int TTF_GlyphIsProvided(IntPtr font, ushort ch);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int TTF_GlyphMetrics(
-			IntPtr font,
-			ushort ch,
-			out int minx,
-			out int maxx,
-			out int miny,
-			out int maxy,
-			out int advance
-		);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int TTF_SizeText(
-			IntPtr font,
-			[In()] [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler))]
-				string text,
-			out int w,
-			out int h
-		);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int TTF_SizeUTF8(
-			IntPtr font,
-			[In()] [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler))]
-				string text,
-			out int w,
-			out int h
-		);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int TTF_SizeUNICODE(
-			IntPtr font,
-			[In()] [MarshalAs(UnmanagedType.LPWStr)]
-				string text,
-			out int w,
-			out int h
-		);
-
-		/* IntPtr refers to an SDL_Surface*, font to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_RenderText_Solid(
-			IntPtr font,
-			[In()] [MarshalAs(UnmanagedType.LPStr)]
-				string text,
-			SDL.SDL_Color fg
-		);
-
-		/* IntPtr refers to an SDL_Surface*, font to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_RenderUTF8_Solid(
-			IntPtr font,
-			[In()] [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler))]
-				string text,
-			SDL.SDL_Color fg
-		);
-
-		/* IntPtr refers to an SDL_Surface*, font to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_RenderUNICODE_Solid(
-			IntPtr font,
-			[In()] [MarshalAs(UnmanagedType.LPWStr)]
-				string text,
-			SDL.SDL_Color fg
-		);
-
-		/* IntPtr refers to an SDL_Surface*, font to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_RenderGlyph_Solid(
-			IntPtr font,
-			ushort ch,
-			SDL.SDL_Color fg
-		);
-
-		/* IntPtr refers to an SDL_Surface*, font to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_RenderText_Shaded(
-			IntPtr font,
-			[In()] [MarshalAs(UnmanagedType.LPStr)]
-				string text,
-			SDL.SDL_Color fg,
-			SDL.SDL_Color bg
-		);
-
-		/* IntPtr refers to an SDL_Surface*, font to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_RenderUTF8_Shaded(
-			IntPtr font,
-			[In()] [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler))]
-				string text,
-			SDL.SDL_Color fg,
-			SDL.SDL_Color bg
-		);
-
-		/* IntPtr refers to an SDL_Surface*, font to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_RenderUNICODE_Shaded(
-			IntPtr font,
-			[In()] [MarshalAs(UnmanagedType.LPWStr)]
-				string text,
-			SDL.SDL_Color fg,
-			SDL.SDL_Color bg
-		);
-
-		/* IntPtr refers to an SDL_Surface*, font to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_RenderGlyph_Shaded(
-			IntPtr font,
-			ushort ch,
-			SDL.SDL_Color fg,
-			SDL.SDL_Color bg
-		);
-
-		/* IntPtr refers to an SDL_Surface*, font to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_RenderText_Blended(
-			IntPtr font,
-			[In()] [MarshalAs(UnmanagedType.LPStr)]
-				string text,
-			SDL.SDL_Color fg
-		);
-
-		/* IntPtr refers to an SDL_Surface*, font to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_RenderUTF8_Blended(
-			IntPtr font,
-			[In()] [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler))]
-				string text,
-			SDL.SDL_Color fg
-		);
-
-		/* IntPtr refers to an SDL_Surface*, font to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_RenderUNICODE_Blended(
-			IntPtr font,
-			[In()] [MarshalAs(UnmanagedType.LPWStr)]
-				string text,
-			SDL.SDL_Color fg
-		);
-
-		/* IntPtr refers to an SDL_Surface*, font to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_RenderText_Blended_Wrapped(
-			IntPtr font,
-			[In()] [MarshalAs(UnmanagedType.LPStr)]
-				string text,
-			SDL.SDL_Color fg,
-			uint wrapped
-		);
-
-		/* IntPtr refers to an SDL_Surface*, font to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_RenderUTF8_Blended_Wrapped(
-			IntPtr font,
-			[In()] [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(LPUtf8StrMarshaler))]
-				string text,
-			SDL.SDL_Color fg,
-			uint wrapped
-		);
-
-		/* IntPtr refers to an SDL_Surface*, font to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_RenderUNICODE_Blended_Wrapped(
-			IntPtr font,
-			[In()] [MarshalAs(UnmanagedType.LPWStr)]
-				string text,
-			SDL.SDL_Color fg,
-			uint wrapped
-		);
-
-		/* IntPtr refers to an SDL_Surface*, font to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern IntPtr TTF_RenderGlyph_Blended(
-			IntPtr font,
-			ushort ch,
-			SDL.SDL_Color fg
-		);
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void TTF_CloseFont(IntPtr font);
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern void TTF_Quit();
-
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int TTF_WasInit();
-
-		/* font refers to a TTF_Font* */
-		[DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
-		public static extern int SDL_GetFontKerningSize(
-			IntPtr font,
-			int prev_index,
-			int index
-		);
-
-		#endregion
-	}
-}