diff --git a/source/lib/external_libraries/png.h b/source/lib/external_libraries/png.h
index b314f9a161..11b5e1b2f4 100644
--- a/source/lib/external_libraries/png.h
+++ b/source/lib/external_libraries/png.h
@@ -1,3 +1,13 @@
+/**
+ * =========================================================================
+ * File        : png.h
+ * Project     : 0 A.D.
+ * Description : bring in LibPNG header+library, with compatibility fixes
+ * =========================================================================
+ */
+
+// license: GPL; see lib/license.txt
+
 // <png.h> includes <zlib.h>, which requires some fixes by our header.
 #include "lib/external_libraries/zlib.h"
 
diff --git a/source/lib/external_libraries/sdl_fwd.h b/source/lib/external_libraries/sdl_fwd.h
index 48c1e2daac..144408825c 100644
--- a/source/lib/external_libraries/sdl_fwd.h
+++ b/source/lib/external_libraries/sdl_fwd.h
@@ -1,3 +1,13 @@
+/**
+ * =========================================================================
+ * File        : sdl_fwd.h
+ * Project     : 0 A.D.
+ * Description : forward declaration of SDL_Event
+ * =========================================================================
+ */
+
+// license: GPL; see lib/license.txt
+
 #ifndef INCLUDED_SDL_FWD
 #define INCLUDED_SDL_FWD
 
@@ -9,7 +19,7 @@
 // SDL_Event is needed. unfortunately it cannot be forward-declared,
 // because it is a union (regrettable design mistake).
 // we fix this by wrapping it in a struct, which can safely be
-// forward-declared and used for pointers.
+// forward-declared and used for SDL_Event_* parameters.
 struct SDL_Event_;
 
 #endif	// #ifndef INCLUDED_SDL_FWD
diff --git a/source/lib/external_libraries/wxwidgets.h b/source/lib/external_libraries/wxwidgets.h
index b65639ed2b..1578bb22d7 100644
--- a/source/lib/external_libraries/wxwidgets.h
+++ b/source/lib/external_libraries/wxwidgets.h
@@ -2,7 +2,7 @@
  * =========================================================================
  * File        : wxwidgets.h
  * Project     : 0 A.D.
- * Description : pulls in wxWidgets headers, with compatibility fixes
+ * Description : bring in wxWidgets headers, with compatibility fixes
  * =========================================================================
  */
 
diff --git a/source/lib/external_libraries/zlib.h b/source/lib/external_libraries/zlib.h
index 6cc1bb95d2..3235bbd98f 100644
--- a/source/lib/external_libraries/zlib.h
+++ b/source/lib/external_libraries/zlib.h
@@ -1,3 +1,13 @@
+/**
+ * =========================================================================
+ * File        : zlib.h
+ * Project     : 0 A.D.
+ * Description : bring in ZLib header+library, with compatibility fixes
+ * =========================================================================
+ */
+
+// license: GPL; see lib/license.txt
+
 // zlib.h -> zconf.h includes <windows.h>, which causes conflicts.
 // define the include guard to prevent it from actually being included and
 // then manually define the few things that are actually needed.
diff --git a/source/lib/res/file/file_util.cpp b/source/lib/res/file/file_util.cpp
index 2467d37da5..b90a25e611 100644
--- a/source/lib/res/file/file_util.cpp
+++ b/source/lib/res/file/file_util.cpp
@@ -1,3 +1,13 @@
+/**
+ * =========================================================================
+ * File        : file_util.cpp
+ * Project     : 0 A.D.
+ * Description : utility functions for file and path handling modules
+ * =========================================================================
+ */
+
+// license: GPL; see lib/license.txt
+
 #include "precompiled.h"
 
 #include <queue>
diff --git a/source/lib/res/handle.h b/source/lib/res/handle.h
index 03c2157727..3a3b327c86 100644
--- a/source/lib/res/handle.h
+++ b/source/lib/res/handle.h
@@ -1,4 +1,12 @@
-// define "Handle". split out of h_mgr.h to reduce dependencies.
+/**
+ * =========================================================================
+ * File        : handle.h
+ * Project     : 0 A.D.
+ * Description : forward declaration of Handle (reduces dependencies)
+ * =========================================================================
+ */
+
+// license: GPL; see lib/license.txt
 
 #ifndef INCLUDED_HANDLE
 #define INCLUDED_HANDLE
diff --git a/source/lib/res/sound/snd_mgr.cpp b/source/lib/res/sound/snd_mgr.cpp
index e8f6f16814..e0f47dee73 100644
--- a/source/lib/res/sound/snd_mgr.cpp
+++ b/source/lib/res/sound/snd_mgr.cpp
@@ -31,7 +31,7 @@
 
 // for DLL-load hack in alc_init
 #if OS_WIN
-# include "lib/sysdep/win/win_internal.h"
+# include "lib/sysdep/win/win.h"
 #endif
 
 #include "lib/res/res.h"
diff --git a/source/lib/secure_crt.cpp b/source/lib/secure_crt.cpp
index 04ab9cd55a..7830ce2ba6 100644
--- a/source/lib/secure_crt.cpp
+++ b/source/lib/secure_crt.cpp
@@ -1,3 +1,13 @@
+/**
+ * =========================================================================
+ * File        : secure_crt.cpp
+ * Project     : 0 A.D.
+ * Description : partial implementation of VC8's secure CRT functions
+ * =========================================================================
+ */
+
+// license: GPL; see lib/license.txt
+
 #include "precompiled.h"
 
 #include <stdio.h>
diff --git a/source/lib/secure_crt.h b/source/lib/secure_crt.h
index 1cf72cf657..2074746d12 100644
--- a/source/lib/secure_crt.h
+++ b/source/lib/secure_crt.h
@@ -1,3 +1,13 @@
+/**
+ * =========================================================================
+ * File        : secure_crt.cpp
+ * Project     : 0 A.D.
+ * Description : partial implementation of VC8's secure CRT functions
+ * =========================================================================
+ */
+
+// license: GPL; see lib/license.txt
+
 #ifndef INCLUDED_SECURE_CRT
 #define INCLUDED_SECURE_CRT
 #if !HAVE_SECURE_CRT
diff --git a/source/lib/sysdep/compiler.h b/source/lib/sysdep/compiler.h
index 3f5a5d8385..e22f132fa9 100644
--- a/source/lib/sysdep/compiler.h
+++ b/source/lib/sysdep/compiler.h
@@ -1,7 +1,16 @@
+/**
+ * =========================================================================
+ * File        : compiler.h
+ * Project     : 0 A.D.
+ * Description : compiler-specific macros and fixes
+ * =========================================================================
+ */
+
+// license: GPL; see lib/license.txt
+
 #ifndef INCLUDED_COMPILER
 #define INCLUDED_COMPILER
 
-
 // pass "omit frame pointer" setting on to the compiler
 #if MSC_VERSION
 # if CONFIG_OMIT_FP
diff --git a/source/lib/sysdep/ia32/ia32.cpp b/source/lib/sysdep/ia32/ia32.cpp
index 3be9d9f65d..a681ad3c51 100644
--- a/source/lib/sysdep/ia32/ia32.cpp
+++ b/source/lib/sysdep/ia32/ia32.cpp
@@ -2,7 +2,7 @@
  * =========================================================================
  * File        : ia32.cpp
  * Project     : 0 A.D.
- * Description : C++ and inline asm implementations for IA-32.
+ * Description : C++ and inline asm implementations of IA-32 functions
  * =========================================================================
  */
 
diff --git a/source/lib/sysdep/ia32/ia32.h b/source/lib/sysdep/ia32/ia32.h
index b665d26725..8cc9fe2d5e 100644
--- a/source/lib/sysdep/ia32/ia32.h
+++ b/source/lib/sysdep/ia32/ia32.h
@@ -2,7 +2,7 @@
  * =========================================================================
  * File        : ia32.h
  * Project     : 0 A.D.
- * Description : C++ and inline asm implementations for IA-32.
+ * Description : C++ and inline asm implementations of IA-32 functions
  * =========================================================================
  */
 
diff --git a/source/lib/sysdep/ia32/ia32_asm.h b/source/lib/sysdep/ia32/ia32_asm.h
index d341922cc3..b08c9d5db8 100644
--- a/source/lib/sysdep/ia32/ia32_asm.h
+++ b/source/lib/sysdep/ia32/ia32_asm.h
@@ -1,3 +1,13 @@
+/**
+ * =========================================================================
+ * File        : ia32_asm.h
+ * Project     : 0 A.D.
+ * Description : interface to various IA-32 functions (written in asm)
+ * =========================================================================
+ */
+
+// license: GPL; see lib/license.txt
+
 #ifndef INCLUDED_IA32_ASM
 #define INCLUDED_IA32_ASM
 
diff --git a/source/lib/sysdep/ia32/ia32_memcpy.h b/source/lib/sysdep/ia32/ia32_memcpy.h
index 6666372885..bc4d3ad516 100644
--- a/source/lib/sysdep/ia32/ia32_memcpy.h
+++ b/source/lib/sysdep/ia32/ia32_memcpy.h
@@ -1,3 +1,13 @@
+/**
+ * =========================================================================
+ * File        : ia32_memcpy.h
+ * Project     : 0 A.D.
+ * Description : interface to highly optimized memcpy (written in asm)
+ * =========================================================================
+ */
+
+// license: GPL; see lib/license.txt
+
 #ifndef INCLUDED_IA32_MEMCPY
 #define INCLUDED_IA32_MEMCPY
 
diff --git a/source/lib/sysdep/ia32/ia32_memcpy_init.cpp b/source/lib/sysdep/ia32/ia32_memcpy_init.cpp
index 6fea86c76a..f96d8a82b5 100644
--- a/source/lib/sysdep/ia32/ia32_memcpy_init.cpp
+++ b/source/lib/sysdep/ia32/ia32_memcpy_init.cpp
@@ -1,3 +1,13 @@
+/**
+ * =========================================================================
+ * File        : ia32_memcpy_init.cpp
+ * Project     : 0 A.D.
+ * Description : initialization for ia32_memcpy (detect CPU caps)
+ * =========================================================================
+ */
+
+// license: GPL; see lib/license.txt
+
 #include "precompiled.h"
 
 #include "ia32.h"
diff --git a/source/lib/sysdep/stl.h b/source/lib/sysdep/stl.h
index 0263f646fd..e918c788bc 100644
--- a/source/lib/sysdep/stl.h
+++ b/source/lib/sysdep/stl.h
@@ -1,3 +1,13 @@
+/**
+ * =========================================================================
+ * File        : stl.h
+ * Project     : 0 A.D.
+ * Description : fixes for various STL implementations
+ * =========================================================================
+ */
+
+// license: GPL; see lib/license.txt
+
 #ifndef INCLUDED_STL
 #define INCLUDED_STL
 
diff --git a/source/lib/sysdep/win/delay_load.cpp b/source/lib/sysdep/win/delay_load.cpp
index 14ea546b16..2618fe8b12 100644
--- a/source/lib/sysdep/win/delay_load.cpp
+++ b/source/lib/sysdep/win/delay_load.cpp
@@ -14,7 +14,7 @@
 #include "delay_load.h"
 
 #include "lib/sysdep/cpu.h"
-#include "win_internal.h"
+#include "win.h"
 #include "winit.h"
 
 
@@ -626,3 +626,4 @@ EXTERN_C PfnDliHook __pfnDliFailureHook2 = 0;
 
 
 
+
diff --git a/source/lib/sysdep/win/dll_ver.cpp b/source/lib/sysdep/win/dll_ver.cpp
index be46989358..55e143c7dc 100644
--- a/source/lib/sysdep/win/dll_ver.cpp
+++ b/source/lib/sysdep/win/dll_ver.cpp
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 
 #include "lib/path_util.h"
-#include "win_internal.h"
+#include "win.h"
 #include "wutil.h"
 
 #if MSC_VERSION
diff --git a/source/lib/sysdep/win/tests/test_wdbg_sym.h b/source/lib/sysdep/win/tests/test_wdbg_sym.h
index 25fe18d16b..881083cc8e 100644
--- a/source/lib/sysdep/win/tests/test_wdbg_sym.h
+++ b/source/lib/sysdep/win/tests/test_wdbg_sym.h
@@ -5,10 +5,10 @@
 
 #include "lib/self_test.h"
 
-#include "lib/sysdep/win/win_internal.h"	// HWND
+#include "lib/sysdep/win/win.h"	// HWND
 #include "lib/debug.h"	// no wdbg_sym interface needed
 #include "lib/sysdep/sysdep.h"
-#include "lib/sysdep/win/win_internal.h"
+#include "lib/sysdep/win/win.h"
 
 #include <queue>
 #include <deque>
diff --git a/source/lib/sysdep/win/wcpu.cpp b/source/lib/sysdep/win/wcpu.cpp
index 24657d51fd..53759761c6 100644
--- a/source/lib/sysdep/win/wcpu.cpp
+++ b/source/lib/sysdep/win/wcpu.cpp
@@ -2,7 +2,7 @@
  * =========================================================================
  * File        : wcpu.cpp
  * Project     : 0 A.D.
- * Description : Windows-specific CPU related code
+ * Description : Windows backend for CPU related code
  * =========================================================================
  */
 
@@ -14,7 +14,7 @@
 #include "lib/lib.h"
 #include "lib/posix/posix_pthread.h"
 #include "lib/posix/posix_time.h"
-#include "win_internal.h"
+#include "win.h"
 #include "wutil.h"
 
 // limit allows statically allocated per-CPU structures (for simplicity).
diff --git a/source/lib/sysdep/win/wcpu.h b/source/lib/sysdep/win/wcpu.h
index 3e7ba2ca54..bc94cfe90f 100644
--- a/source/lib/sysdep/win/wcpu.h
+++ b/source/lib/sysdep/win/wcpu.h
@@ -1,3 +1,13 @@
+/**
+ * =========================================================================
+ * File        : wcpu.h
+ * Project     : 0 A.D.
+ * Description : Windows backend for CPU related code
+ * =========================================================================
+ */
+
+// license: GPL; see lib/license.txt
+
 #ifndef INCLUDED_WCPU
 #define INCLUDED_WCPU
 
diff --git a/source/lib/sysdep/win/wdbg.cpp b/source/lib/sysdep/win/wdbg.cpp
index 4d36d23fe6..c9ef20ac1d 100644
--- a/source/lib/sysdep/win/wdbg.cpp
+++ b/source/lib/sysdep/win/wdbg.cpp
@@ -20,7 +20,7 @@
 #include "lib/byte_order.h"		// FOURCC
 #include "lib/app_hooks.h"
 #include "lib/sysdep/cpu.h"
-#include "win_internal.h"
+#include "win.h"
 #include "wdbg_sym.h"
 #include "winit.h"
 #include "wutil.h"
@@ -801,3 +801,4 @@ bool debug_is_stack_ptr(void* p)
 
 
 
+
diff --git a/source/lib/sysdep/win/wdbg_sym.cpp b/source/lib/sysdep/win/wdbg_sym.cpp
index 1dc8690cf1..23b365bed9 100644
--- a/source/lib/sysdep/win/wdbg_sym.cpp
+++ b/source/lib/sysdep/win/wdbg_sym.cpp
@@ -24,7 +24,7 @@
 #if CPU_IA32
 # include "lib/sysdep/ia32/ia32.h"
 #endif
-#include "win_internal.h"
+#include "win.h"
 #include "winit.h"
 #include "wutil.h"
 
diff --git a/source/lib/sysdep/win/wdbg_sym.h b/source/lib/sysdep/win/wdbg_sym.h
index b88555e19e..7a34b70def 100644
--- a/source/lib/sysdep/win/wdbg_sym.h
+++ b/source/lib/sysdep/win/wdbg_sym.h
@@ -1,3 +1,13 @@
+/**
+ * =========================================================================
+ * File        : wdbg_sym.h
+ * Project     : 0 A.D.
+ * Description : Win32 stack trace and symbol engine.
+ * =========================================================================
+ */
+
+// license: GPL; see lib/license.txt
+
 #ifndef INCLUDED_WDBG_SYM
 #define INCLUDED_WDBG_SYM
 
diff --git a/source/lib/sysdep/win/wdir_watch.cpp b/source/lib/sysdep/win/wdir_watch.cpp
index da24475382..7d0fde5efc 100644
--- a/source/lib/sysdep/win/wdir_watch.cpp
+++ b/source/lib/sysdep/win/wdir_watch.cpp
@@ -18,7 +18,7 @@
 #include "lib/lib.h"
 #include "lib/path_util.h"
 #include "lib/res/file/file.h"	// path_is_subpath
-#include "win_internal.h"
+#include "win.h"
 #include "winit.h"
 #include "wutil.h"
 
diff --git a/source/lib/sysdep/win/wgfx.cpp b/source/lib/sysdep/win/wgfx.cpp
index 24b21f2e8b..1e9cb78c52 100644
--- a/source/lib/sysdep/win/wgfx.cpp
+++ b/source/lib/sysdep/win/wgfx.cpp
@@ -12,7 +12,7 @@
 #include "lib/sysdep/gfx.h"
 
 #include "dll_ver.h"	// dll_list_*
-#include "win_internal.h"
+#include "win.h"
 
 #if MSC_VERSION
 #pragma comment(lib, "advapi32.lib")	// registry
diff --git a/source/lib/sysdep/win/win_internal.h b/source/lib/sysdep/win/win.h
similarity index 98%
rename from source/lib/sysdep/win/win_internal.h
rename to source/lib/sysdep/win/win.h
index 8e0a3336bd..300e2e47a2 100644
--- a/source/lib/sysdep/win/win_internal.h
+++ b/source/lib/sysdep/win/win.h
@@ -1,8 +1,8 @@
 /**
  * =========================================================================
- * File        : win_internal.h
+ * File        : win.h
  * Project     : 0 A.D.
- * Description : include <windows.h>, with compatibility fixes afterwards
+ * Description : bring in <windows.h> with compatibility fixes
  * =========================================================================
  */
 
@@ -12,7 +12,7 @@
 #define INCLUDED_WIN
 
 #if !OS_WIN
-#error "win_internal.h: do not include if not compiling for Windows"
+#error "win.h: do not include if not compiling for Windows"
 #endif
 
 // Win32 socket declarations aren't portable (e.g. problems with socklen_t)
diff --git a/source/lib/sysdep/win/wposix/waio_internal.h b/source/lib/sysdep/win/wposix/waio_internal.h
deleted file mode 100644
index 1e6303bf08..0000000000
--- a/source/lib/sysdep/win/wposix/waio_internal.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/lib/sysdep/win/wposix/wposix_internal.h b/source/lib/sysdep/win/wposix/wposix_internal.h
index 5345be6262..7c2c7ea911 100644
--- a/source/lib/sysdep/win/wposix/wposix_internal.h
+++ b/source/lib/sysdep/win/wposix/wposix_internal.h
@@ -2,7 +2,7 @@
 #define INCLUDED_WPOSIX_INTERNAL
 
 #include "lib/lib.h"
-#include "lib/sysdep/win/win_internal.h"
+#include "lib/sysdep/win/win.h"
 #include "lib/sysdep/win/winit.h"
 #include "lib/sysdep/win/wutil.h"
 
diff --git a/source/lib/sysdep/win/wprintf.cpp b/source/lib/sysdep/win/wprintf.cpp
index 014c741048..ac87709761 100644
--- a/source/lib/sysdep/win/wprintf.cpp
+++ b/source/lib/sysdep/win/wprintf.cpp
@@ -1,3 +1,11 @@
+/**
+ * =========================================================================
+ * File        : wprintf.cpp
+ * Project     : 0 A.D.
+ * Description : implementation of sys_vsnprintf.
+ * =========================================================================
+ */
+
 #include "precompiled.h"
 
 /*
diff --git a/source/lib/sysdep/win/wsdl.cpp b/source/lib/sysdep/win/wsdl.cpp
index 6ffd4c30c0..6b5f6d1481 100644
--- a/source/lib/sysdep/win/wsdl.cpp
+++ b/source/lib/sysdep/win/wsdl.cpp
@@ -16,7 +16,7 @@
 #include <queue>
 #include <algorithm>
 
-#include "win_internal.h"
+#include "win.h"
 #include <ddraw.h>
 #include <process.h>	// _beginthreadex
 #include <WindowsX.h>	// message crackers
diff --git a/source/lib/sysdep/win/wsnd.cpp b/source/lib/sysdep/win/wsnd.cpp
index add644547d..0be382f0cf 100644
--- a/source/lib/sysdep/win/wsnd.cpp
+++ b/source/lib/sysdep/win/wsnd.cpp
@@ -19,7 +19,7 @@
 #include "lib/path_util.h"
 #include "lib/res/file/file.h"
 #include "dll_ver.h"	// dll_list_*
-#include "win_internal.h"
+#include "win.h"
 #include "wutil.h"
 
 
diff --git a/source/lib/sysdep/win/wstartup.cpp b/source/lib/sysdep/win/wstartup.cpp
index 89b1bd2beb..02fa43203c 100644
--- a/source/lib/sysdep/win/wstartup.cpp
+++ b/source/lib/sysdep/win/wstartup.cpp
@@ -13,7 +13,7 @@
 
 #include "winit.h"
 #include "wdbg.h"			// wdbg_exception_filter
-#include "win_internal.h"	// GetExceptionInformation
+#include "win.h"	// GetExceptionInformation
 
 #if MSC_VERSION >= 1400
 #include <process.h>		// __security_init_cookie
diff --git a/source/lib/sysdep/win/wsysdep.cpp b/source/lib/sysdep/win/wsysdep.cpp
index c470064ce4..cee055091d 100644
--- a/source/lib/sysdep/win/wsysdep.cpp
+++ b/source/lib/sysdep/win/wsysdep.cpp
@@ -11,7 +11,7 @@
 #include "precompiled.h"
 #include "lib/sysdep/sysdep.h"
 
-#include "win_internal.h"	// includes windows.h; must come before shlobj
+#include "win.h"	// includes windows.h; must come before shlobj
 #include <shlobj.h>	// pick_dir
 
 #include "lib/lib.h"
@@ -608,3 +608,4 @@ LibError sys_pick_directory(char* path, size_t buf_size)
 }
 
 
+
diff --git a/source/lib/sysdep/win/wsysdep.h b/source/lib/sysdep/win/wsysdep.h
deleted file mode 100644
index e22dfdc195..0000000000
--- a/source/lib/sysdep/win/wsysdep.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef INCLUDED_WSYSDEP
-#define INCLUDED_WSYSDEP
-
-#endif	// #ifndef INCLUDED_WSYSDEP
diff --git a/source/lib/sysdep/win/wutil.cpp b/source/lib/sysdep/win/wutil.cpp
index ccfe09b035..a1b4e3486d 100644
--- a/source/lib/sysdep/win/wutil.cpp
+++ b/source/lib/sysdep/win/wutil.cpp
@@ -16,7 +16,7 @@
 
 #include "lib/path_util.h"
 #include "lib/posix/posix.h"
-#include "win_internal.h"
+#include "win.h"
 #include "winit.h"
 
 
diff --git a/source/lib/sysdep/win/wutil.h b/source/lib/sysdep/win/wutil.h
index 34d05d3665..5fb3a5a6fa 100644
--- a/source/lib/sysdep/win/wutil.h
+++ b/source/lib/sysdep/win/wutil.h
@@ -15,7 +15,7 @@
 #error "wutil.h: do not include if not compiling for Windows"
 #endif
 
-#include "win_internal.h"
+#include "win.h"
 
 
 //-----------------------------------------------------------------------------
diff --git a/source/network/SocketBase.cpp b/source/network/SocketBase.cpp
index eea8834475..1a0425b333 100644
--- a/source/network/SocketBase.cpp
+++ b/source/network/SocketBase.cpp
@@ -1,7 +1,7 @@
 #include "precompiled.h"
 
 #if OS_WIN
-#include "lib/sysdep/win/win_internal.h"
+#include "lib/sysdep/win/win.h"
 #include "lib/sysdep/win/wposix/wsock_internal.h"
 #endif
 
diff --git a/source/sound/SoundGroup.cpp b/source/sound/SoundGroup.cpp
index 86f3c0b65a..6980559501 100644
--- a/source/sound/SoundGroup.cpp
+++ b/source/sound/SoundGroup.cpp
@@ -7,34 +7,20 @@
 * =========================================================================
 */
 
-/*
- * Copyright (c) 2005-2006 Gavin Fowler
- *
- * Redistribution and/or modification are also permitted under the
- * terms of the GNU General Public License as published by the
- * Free Software Foundation (version 2 or later, at your option).
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
+// license: GPL; see sound/license.txt
 
 #include "precompiled.h"
+#include "SoundGroup.h"
 
 #include <algorithm>
 
-#include "SoundGroup.h"
-
 #include "ps/XML/Xeromyces.h"
-
 #include "ps/CLogger.h"
-
 #include "lib/lib.h"
 
 #define LOG_CATEGORY "audio"
 
 
-
 CSoundGroup::CSoundGroup()
 {
 	m_index = 0;
diff --git a/source/sound/SoundGroup.h b/source/sound/SoundGroup.h
index 2a3fe35995..4c74eba70d 100644
--- a/source/sound/SoundGroup.h
+++ b/source/sound/SoundGroup.h
@@ -7,17 +7,7 @@
 * =========================================================================
 */
 
-/*
- * Copyright (c) 2005-2006 Gavin Fowler
- *
- * Redistribution and/or modification are also permitted under the
- * terms of the GNU General Public License as published by the
- * Free Software Foundation (version 2 or later, at your option).
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
+// license: GPL; see sound/license.txt
 
 /*
 Example usage: (SEE SOUNDGROUPMGR.H)
diff --git a/source/sound/SoundGroupMgr.cpp b/source/sound/SoundGroupMgr.cpp
index 8a5a1b0f04..c538b4f977 100644
--- a/source/sound/SoundGroupMgr.cpp
+++ b/source/sound/SoundGroupMgr.cpp
@@ -6,17 +6,7 @@
 * =========================================================================
 */
 
-/*
- * Copyright (c) 2005-2006 Gavin Fowler
- *
- * Redistribution and/or modification are also permitted under the
- * terms of the GNU General Public License as published by the
- * Free Software Foundation (version 2 or later, at your option).
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
+// license: GPL; see sound/license.txt
 
 // Example usage: 
 
diff --git a/source/sound/SoundGroupMgr.h b/source/sound/SoundGroupMgr.h
index f3c0d6439f..086f14140d 100644
--- a/source/sound/SoundGroupMgr.h
+++ b/source/sound/SoundGroupMgr.h
@@ -6,18 +6,7 @@
 * =========================================================================
 */
 
-
-/*
- * Copyright (c) 2005-2006 Gavin Fowler
- *
- * Redistribution and/or modification are also permitted under the
- * terms of the GNU General Public License as published by the
- * Free Software Foundation (version 2 or later, at your option).
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
+// license: GPL; see sound/license.txt
 
 #include "SoundGroup.h"
 #include <vector>