diff --git a/source/graphics/MapReader.cpp b/source/graphics/MapReader.cpp
index 6ad3be8cac..fa799907db 100644
--- a/source/graphics/MapReader.cpp
+++ b/source/graphics/MapReader.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 #include "graphics/TerrainTextureEntry.h"
 #include "graphics/TerrainTextureManager.h"
 #include "lib/timer.h"
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 #include "maths/MathUtil.h"
 #include "ps/CLogger.h"
 #include "ps/Loader.h"
diff --git a/source/graphics/TextureConverter.h b/source/graphics/TextureConverter.h
index ddda59491a..e9e6213630 100644
--- a/source/graphics/TextureConverter.h
+++ b/source/graphics/TextureConverter.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 
 #include "lib/file/vfs/vfs.h"
 #include "lib/posix/posix_pthread.h"
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 
 #include "TextureManager.h"
 
diff --git a/source/graphics/tests/test_TextureManager.h b/source/graphics/tests/test_TextureManager.h
index 6235e1832f..fb8989275d 100644
--- a/source/graphics/tests/test_TextureManager.h
+++ b/source/graphics/tests/test_TextureManager.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 
 #include "graphics/TextureManager.h"
 #include "lib/alignment.h"
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 #include "lib/file/vfs/vfs.h"
 #include "lib/res/h_mgr.h"
 #include "lib/tex/tex.h"
diff --git a/source/gui/CDropDown.cpp b/source/gui/CDropDown.cpp
index a7f6f5f704..cf9f348867 100644
--- a/source/gui/CDropDown.cpp
+++ b/source/gui/CDropDown.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -24,7 +24,7 @@ CDropDown
 #include "CDropDown.h"
 
 #include "lib/ogl.h"
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 
 
 //-------------------------------------------------------------------
diff --git a/source/gui/CList.cpp b/source/gui/CList.cpp
index d47df7158f..dce9e5d371 100644
--- a/source/gui/CList.cpp
+++ b/source/gui/CList.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -25,7 +25,7 @@ CList
 #include "CGUIScrollBarVertical.h"
 
 #include "ps/CLogger.h"
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 
 
 //-------------------------------------------------------------------
diff --git a/source/gui/MiniMap.cpp b/source/gui/MiniMap.cpp
index 4d8ff0b9c0..758b3d357e 100644
--- a/source/gui/MiniMap.cpp
+++ b/source/gui/MiniMap.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 #include "graphics/TerrainTextureManager.h"
 #include "graphics/TerritoryTexture.h"
 #include "lib/ogl.h"
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 #include "lib/bits.h"
 #include "lib/timer.h"
 #include "ps/Game.h"
diff --git a/source/gui/scripting/GuiScriptConversions.cpp b/source/gui/scripting/GuiScriptConversions.cpp
index 7f4bd8a2c5..40a35b4bb0 100644
--- a/source/gui/scripting/GuiScriptConversions.cpp
+++ b/source/gui/scripting/GuiScriptConversions.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 #include "scriptinterface/ScriptInterface.h"
 
 #include "gui/IGUIObject.h"
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 #include "ps/Hotkey.h"
 
 #include "js/jsapi.h"
diff --git a/source/lib/external_libraries/sdl.h b/source/lib/external_libraries/libsdl.h
similarity index 95%
rename from source/lib/external_libraries/sdl.h
rename to source/lib/external_libraries/libsdl.h
index 19096e91d7..edc5024922 100644
--- a/source/lib/external_libraries/sdl.h
+++ b/source/lib/external_libraries/libsdl.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010 Wildfire Games
+/* Copyright (c) 2012 Wildfire Games
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@
 #ifndef INCLUDED_SDL
 #define INCLUDED_SDL
 
-#include "lib/external_libraries/sdl_fwd.h"
+#include "lib/external_libraries/libsdl_fwd.h"
 #include "lib/config2.h"	// CONFIG2_WSDL
 
 #if OS_WIN && CONFIG2_WSDL
diff --git a/source/lib/external_libraries/sdl_fwd.h b/source/lib/external_libraries/libsdl_fwd.h
similarity index 100%
rename from source/lib/external_libraries/sdl_fwd.h
rename to source/lib/external_libraries/libsdl_fwd.h
diff --git a/source/lib/input.cpp b/source/lib/input.cpp
index 8bd8ab5e96..30c5812dc3 100644
--- a/source/lib/input.cpp
+++ b/source/lib/input.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010 Wildfire Games
+/* Copyright (c) 2012 Wildfire Games
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 
 const size_t MAX_HANDLERS = 8;
 static InHandler handler_stack[MAX_HANDLERS];
diff --git a/source/lib/input.h b/source/lib/input.h
index 1f5794a1b1..6d55f8649b 100644
--- a/source/lib/input.h
+++ b/source/lib/input.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010 Wildfire Games
+/* Copyright (c) 2012 Wildfire Games
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -28,7 +28,7 @@
 #define INCLUDED_INPUT
 
 
-#include "lib/external_libraries/sdl_fwd.h"
+#include "lib/external_libraries/libsdl_fwd.h"
 
 // input handler return values.
 enum InReaction
diff --git a/source/lib/ogl.cpp b/source/lib/ogl.cpp
index 8b8d378fc9..7e87b89841 100644
--- a/source/lib/ogl.cpp
+++ b/source/lib/ogl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 Wildfire Games
+/* Copyright (c) 2012 Wildfire Games
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 #include "lib/debug.h"
 #include "lib/sysdep/gfx.h"
 #include "lib/res/h_mgr.h"
diff --git a/source/lib/sysdep/gfx.cpp b/source/lib/sysdep/gfx.cpp
index c41f5f530e..04e22782af 100644
--- a/source/lib/sysdep/gfx.cpp
+++ b/source/lib/sysdep/gfx.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010 Wildfire Games
+/* Copyright (c) 2012 Wildfire Games
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -28,7 +28,7 @@
 #include "lib/sysdep/gfx.h"
 
 #define WSDL_NO_KEYSYM
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 #include "lib/ogl.h"
 
 #if OS_WIN
diff --git a/source/lib/sysdep/os/unix/unix.cpp b/source/lib/sysdep/os/unix/unix.cpp
index 1e9535bfc3..96db928ad0 100644
--- a/source/lib/sysdep/os/unix/unix.cpp
+++ b/source/lib/sysdep/os/unix/unix.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 Wildfire Games
+/* Copyright (c) 2012 Wildfire Games
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <wchar.h>
 
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 #include "lib/utf8.h"
 #include "lib/sysdep/sysdep.h"
 #include "lib/sysdep/cursor.h"
diff --git a/source/lib/sysdep/os/win/wsdl.cpp b/source/lib/sysdep/os/win/wsdl.cpp
index ca6bbdbde9..3a0a6e89a9 100644
--- a/source/lib/sysdep/os/win/wsdl.cpp
+++ b/source/lib/sysdep/os/win/wsdl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010 Wildfire Games
+/* Copyright (c) 2012 Wildfire Games
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -25,7 +25,7 @@
  */
 
 #include "precompiled.h"
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 
 #if CONFIG2_WSDL
 
diff --git a/source/main.cpp b/source/main.cpp
index d97bb1e6dc..1c18ea27bf 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -38,7 +38,7 @@ that of Atlas depending on commandline parameters.
 #include "lib/input.h"
 #include "lib/ogl.h"
 #include "lib/timer.h"
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 #include "lib/res/sound/snd_mgr.h"
 
 #include "ps/ArchiveBuilder.h"
diff --git a/source/network/tests/test_Net.h b/source/network/tests/test_Net.h
index 54d8296fc7..daf864f327 100644
--- a/source/network/tests/test_Net.h
+++ b/source/network/tests/test_Net.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 
 #include "graphics/TerrainTextureManager.h"
 #include "lib/external_libraries/enet.h"
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 #include "lib/tex/tex.h"
 #include "network/NetServer.h"
 #include "network/NetClient.h"
diff --git a/source/ps/GameSetup/GameSetup.cpp b/source/ps/GameSetup/GameSetup.cpp
index db1dd8ed09..f252c0367b 100644
--- a/source/ps/GameSetup/GameSetup.cpp
+++ b/source/ps/GameSetup/GameSetup.cpp
@@ -21,7 +21,7 @@
 #include "lib/input.h"
 #include "lib/ogl.h"
 #include "lib/timer.h"
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 #include "lib/file/common/file_stats.h"
 #include "lib/res/h_mgr.h"
 #include "lib/res/graphics/cursor.h"
diff --git a/source/ps/Globals.cpp b/source/ps/Globals.cpp
index ce35abaf72..bcf9c03505 100644
--- a/source/ps/Globals.cpp
+++ b/source/ps/Globals.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 #include "precompiled.h"
 #include "Globals.h"
 
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 
 
 bool g_app_minimized = false;
diff --git a/source/ps/Hotkey.h b/source/ps/Hotkey.h
index 127ef8027f..27676510fd 100644
--- a/source/ps/Hotkey.h
+++ b/source/ps/Hotkey.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -32,7 +32,7 @@
 
 #include "CStr.h"
 #include "lib/input.h"
-#include "lib/external_libraries/sdl.h"	// see note below
+#include "lib/external_libraries/libsdl.h"	// see note below
 
 // note: we need the real SDL header - it defines SDL_USEREVENT, which is
 // required for our HOTKEY event type definition. this is OK since
diff --git a/source/ps/Joystick.cpp b/source/ps/Joystick.cpp
index 8c7d4ad214..62e3463385 100644
--- a/source/ps/Joystick.cpp
+++ b/source/ps/Joystick.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 
 #include "Joystick.h"
 
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 #include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
 
diff --git a/source/ps/Joystick.h b/source/ps/Joystick.h
index fe1aa2b6cd..e123b6b5bf 100644
--- a/source/ps/Joystick.h
+++ b/source/ps/Joystick.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 #ifndef INCLUDED_JOYSTICK
 #define INCLUDED_JOYSTICK
 
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 
 class CJoystick
 {
diff --git a/source/ps/KeyName.cpp b/source/ps/KeyName.cpp
index 0f4c8d5a59..d20332de73 100644
--- a/source/ps/KeyName.cpp
+++ b/source/ps/KeyName.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21,7 +21,7 @@
 
 #include "KeyName.h"
 #include "CStr.h"
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 
 #include <map>
 
diff --git a/source/ps/KeyName.h b/source/ps/KeyName.h
index f57839f09d..28444d4703 100644
--- a/source/ps/KeyName.h
+++ b/source/ps/KeyName.h
@@ -19,7 +19,7 @@
 #define INCLUDED_KEYNAME
 
 // Need SDLK_* enum values.
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 
 class CStr8;
 
diff --git a/source/ps/ProfileViewer.cpp b/source/ps/ProfileViewer.cpp
index 91c47f2ecf..0d673e3a4a 100644
--- a/source/ps/ProfileViewer.cpp
+++ b/source/ps/ProfileViewer.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -32,7 +32,7 @@
 #include "ps/Font.h"
 #include "ps/Hotkey.h"
 #include "ps/Profile.h"
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 #include "lib/res/graphics/unifont.h"
 #include "renderer/Renderer.h"
 #include "scriptinterface/ScriptInterface.h"
diff --git a/source/ps/UserReport.cpp b/source/ps/UserReport.cpp
index 120badd9ab..60be4e3807 100644
--- a/source/ps/UserReport.cpp
+++ b/source/ps/UserReport.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
 #include "lib/timer.h"
 #include "lib/utf8.h"
 #include "lib/external_libraries/curl.h"
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 #include "lib/external_libraries/zlib.h"
 #include "lib/file/archive/stream.h"
 #include "lib/sysdep/sysdep.h"
diff --git a/source/ps/VideoMode.cpp b/source/ps/VideoMode.cpp
index 04fe0df0c3..195e257863 100644
--- a/source/ps/VideoMode.cpp
+++ b/source/ps/VideoMode.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -23,7 +23,7 @@
 #include "graphics/GameView.h"
 #include "gui/GUIManager.h"
 #include "lib/ogl.h"
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 #include "lib/sysdep/gfx.h"
 #include "ps/CConsole.h"
 #include "ps/CLogger.h"
diff --git a/source/tools/atlas/GameInterface/GameLoop.cpp b/source/tools/atlas/GameInterface/GameLoop.cpp
index 2885261922..fd77fe7d74 100644
--- a/source/tools/atlas/GameInterface/GameLoop.cpp
+++ b/source/tools/atlas/GameInterface/GameLoop.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -31,7 +31,7 @@
 #include "graphics/TextureManager.h"
 #include "gui/GUIManager.h"
 #include "lib/app_hooks.h"
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 #include "lib/timer.h"
 #include "ps/CLogger.h"
 #include "ps/DllLoader.h"
diff --git a/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
index 34806eb799..87789add84 100644
--- a/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -26,7 +26,7 @@
 #include "graphics/GameView.h"
 #include "graphics/ObjectManager.h"
 #include "gui/GUIManager.h"
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 #include "maths/MathUtil.h"
 #include "ps/CConsole.h"
 #include "ps/Game.h"
diff --git a/source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
index c1ef29934f..11ff34d13d 100644
--- a/source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2012 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 #include "graphics/CinemaTrack.h"
 #include "graphics/GameView.h"
 #include "gui/GUIManager.h"
-#include "lib/external_libraries/sdl.h"
+#include "lib/external_libraries/libsdl.h"
 #include "lib/sysdep/cpu.h"
 #include "maths/MathUtil.h"
 #include "ps/Game.h"