Index: trunk/src/gl/gl_device.cc
===================================================================
--- trunk/src/gl/gl_device.cc	(revision 168)
+++ trunk/src/gl/gl_device.cc	(revision 170)
@@ -10,5 +10,5 @@
 #include "nv/gl/gl_texture2d.hh"
 #include "nv/logging.hh"
-#include "nv/lib/sdl12.hh"
+#include "nv/lib/sdl.hh"
 #include "nv/lib/sdl_image.hh"
 
Index: trunk/src/gl/gl_window.cc
===================================================================
--- trunk/src/gl/gl_window.cc	(revision 168)
+++ trunk/src/gl/gl_window.cc	(revision 170)
@@ -7,5 +7,5 @@
 #include "nv/logging.hh"
 #include "nv/lib/gl.hh"
-#include "nv/lib/sdl12.hh"
+#include "nv/lib/sdl.hh"
 
 using namespace nv;
Index: trunk/src/lib/gl.cc
===================================================================
--- trunk/src/lib/gl.cc	(revision 168)
+++ trunk/src/lib/gl.cc	(revision 170)
@@ -13,5 +13,5 @@
 
 #if defined( NV_SDL_GL )
-#	include "nv/lib/sdl12.hh"
+#	include "nv/lib/sdl.hh"
 #endif
 
Index: trunk/src/lib/sdl.cc
===================================================================
--- trunk/src/lib/sdl.cc	(revision 170)
+++ trunk/src/lib/sdl.cc	(revision 170)
@@ -0,0 +1,27 @@
+// Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
+// http://chaosforge.org/
+//
+// This file is part of NV Libraries.
+// For conditions of distribution and use, see copyright notice in nv.hh
+
+#include "nv/lib/sdl.hh"
+
+#if defined( NV_SDL_DYNAMIC )
+
+#include "nv/library.hh"
+
+#define NV_SDL_FUN( rtype, fname, fparams ) rtype (NV_SDL_APIENTRY *fname) fparams = nullptr;
+#include <nv/lib/detail/sdl_functions.inc>
+#undef NV_SDL_FUN
+
+bool nv::load_sdl_library( const char* path )
+{
+	static nv::library sdl_library;
+	if ( sdl_library.is_open() ) return true;
+	sdl_library.open( path );
+#	define NV_SDL_FUN( rtype, fname, fparams ) *(void **) (&fname) = sdl_library.get(#fname);
+#	include <nv/lib/detail/sdl_functions.inc>
+#	undef NV_SDL_FUN
+	return true;
+}
+#endif
Index: trunk/src/lib/sdl12.cc
===================================================================
--- trunk/src/lib/sdl12.cc	(revision 168)
+++ 	(revision )
@@ -1,27 +1,0 @@
-// Copyright (C) 2012-2013 ChaosForge / Kornel Kisielewicz
-// http://chaosforge.org/
-//
-// This file is part of NV Libraries.
-// For conditions of distribution and use, see copyright notice in nv.hh
-
-#include "nv/lib/sdl12.hh"
-
-#if defined( NV_SDL_DYNAMIC )
-
-#include "nv/library.hh"
-
-#define NV_SDL_FUN( rtype, fname, fparams ) rtype (NV_SDL_APIENTRY *fname) fparams = nullptr;
-#include <nv/lib/detail/sdl_functions.inc>
-#undef NV_SDL_FUN
-
-bool nv::load_sdl_library( const char* path )
-{
-	static nv::library sdl_library;
-	if ( sdl_library.is_open() ) return true;
-	sdl_library.open( path );
-#	define NV_SDL_FUN( rtype, fname, fparams ) *(void **) (&fname) = sdl_library.get(#fname);
-#	include <nv/lib/detail/sdl_functions.inc>
-#	undef NV_SDL_FUN
-	return true;
-}
-#endif