[Scummvm-cvs-logs] scummvm-tools master -> 857f3c8d55504a80dcb8a937da4f920dc1974e35

criezy criezy at scummvm.org
Sun Jan 19 19:26:16 CET 2014


This automated email contains information about 5 new commits which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
fe2d3c2d71 JANITORIAL: Remove now useless SVN tags
d1e0358ca3 JANITORIAL: Split copyright notice and descriptive comment
d5c8077933 JANITORIAL: Move copyright notice to a separate file
0e994ea305 GIT: Ignore pegasus_save_types executable
857f3c8d55 GIT: Ignore Mac DS_Store files


Commit: fe2d3c2d71388094a79d6426ac226657309c3bf1
    https://github.com/scummvm/scummvm-tools/commit/fe2d3c2d71388094a79d6426ac226657309c3bf1
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2014-01-06T14:54:34-08:00

Commit Message:
JANITORIAL: Remove now useless SVN tags

Changed paths:
    Makefile
    Makefile.common
    common/algorithm.h
    common/array.h
    common/endian.h
    common/file.cpp
    common/file.h
    common/func.h
    common/hash-str.h
    common/hashmap.cpp
    common/hashmap.h
    common/md5.cpp
    common/md5.h
    common/memorypool.cpp
    common/memorypool.h
    common/noncopyable.h
    common/pack-end.h
    common/pack-start.h
    common/scummsys.h
    common/str.cpp
    common/str.h
    common/util.cpp
    common/util.h
    compress.cpp
    compress.h
    create_sjisfnt.cpp
    create_sjisfnt.h
    decompiler/codegen.cpp
    decompiler/codegen.h
    decompiler/control_flow.cpp
    decompiler/control_flow.h
    decompiler/decompiler.cpp
    decompiler/disassembler.cpp
    decompiler/disassembler.h
    decompiler/engine.h
    decompiler/graph.cpp
    decompiler/graph.h
    decompiler/groovie/disassembler.cpp
    decompiler/groovie/disassembler.h
    decompiler/groovie/engine.cpp
    decompiler/groovie/engine.h
    decompiler/groovie/opcodes.h
    decompiler/instruction.cpp
    decompiler/instruction.h
    decompiler/kyra/codegen.cpp
    decompiler/kyra/codegen.h
    decompiler/kyra/disassembler.cpp
    decompiler/kyra/disassembler.h
    decompiler/kyra/engine.cpp
    decompiler/kyra/engine.h
    decompiler/objectFactory.h
    decompiler/refcounted.h
    decompiler/scummv6/codegen.cpp
    decompiler/scummv6/codegen.h
    decompiler/scummv6/disassembler.cpp
    decompiler/scummv6/disassembler.h
    decompiler/scummv6/engine.cpp
    decompiler/scummv6/engine.h
    decompiler/simple_disassembler.cpp
    decompiler/simple_disassembler.h
    decompiler/stack.h
    decompiler/test/cfg_test.h
    decompiler/test/codegen.h
    decompiler/test/disassembler/pasc.cpp
    decompiler/test/disassembler/pasc.h
    decompiler/test/disassembler/subopcode.cpp
    decompiler/test/disassembler/subopcode.h
    decompiler/test/disassembler_test.h
    decompiler/unknown_opcode.cpp
    decompiler/unknown_opcode.h
    decompiler/value.cpp
    decompiler/value.h
    decompiler/wrongtype.h
    encode_dxa.cpp
    encode_dxa.h
    engines/agos/compress_agos.cpp
    engines/agos/compress_agos.h
    engines/agos/extract_agos.cpp
    engines/agos/extract_agos.h
    engines/cge/cge_structs.h
    engines/cge/extract_cge.cpp
    engines/cge/extract_cge.h
    engines/cge/pack_cge.cpp
    engines/cge/pack_cge.h
    engines/cine/decine.cpp
    engines/cine/extract_cine.cpp
    engines/cine/extract_cine.h
    engines/cruise/extract_cruise_pc.cpp
    engines/cruise/extract_cruise_pc.h
    engines/gob/compress_gob.cpp
    engines/gob/compress_gob.h
    engines/gob/degob.cpp
    engines/gob/degob_script.cpp
    engines/gob/degob_script.h
    engines/gob/degob_script_bargon.cpp
    engines/gob/degob_script_fascin.cpp
    engines/gob/degob_script_geisha.cpp
    engines/gob/degob_script_littlered.cpp
    engines/gob/degob_script_v1.cpp
    engines/gob/degob_script_v2.cpp
    engines/gob/degob_script_v3.cpp
    engines/gob/degob_script_v4.cpp
    engines/gob/degob_script_v5.cpp
    engines/gob/degob_script_v6.cpp
    engines/gob/extract_fascination_cd.cpp
    engines/gob/extract_fascination_cd.h
    engines/gob/extract_gob_stk.cpp
    engines/gob/extract_gob_stk.h
    engines/gob/gob_loadcalc.cpp
    engines/kyra/compress_kyra.cpp
    engines/kyra/compress_kyra.h
    engines/kyra/dekyra.cpp
    engines/kyra/dekyra.h
    engines/kyra/dekyra_v1.cpp
    engines/kyra/extract_kyra.cpp
    engines/kyra/extract_kyra.h
    engines/kyra/kyra_ins.cpp
    engines/kyra/kyra_ins.h
    engines/kyra/kyra_pak.cpp
    engines/kyra/kyra_pak.h
    engines/mohawk/archive.cpp
    engines/mohawk/archive.h
    engines/mohawk/construct_mohawk.cpp
    engines/mohawk/deriven.cpp
    engines/mohawk/extract_mohawk.cpp
    engines/parallaction/extract_parallaction.cpp
    engines/parallaction/extract_parallaction.h
    engines/pegasus/pegasus_save_types.cpp
    engines/queen/compress_queen.cpp
    engines/queen/compress_queen.h
    engines/saga/compress_saga.cpp
    engines/saga/compress_saga.h
    engines/sci/compress_sci.cpp
    engines/sci/compress_sci.h
    engines/scumm/compress_scumm_bun.cpp
    engines/scumm/compress_scumm_bun.h
    engines/scumm/compress_scumm_san.cpp
    engines/scumm/compress_scumm_san.h
    engines/scumm/compress_scumm_sou.cpp
    engines/scumm/compress_scumm_sou.h
    engines/scumm/descumm-common.cpp
    engines/scumm/descumm-tool.cpp
    engines/scumm/descumm.cpp
    engines/scumm/descumm.h
    engines/scumm/descumm6.cpp
    engines/scumm/extract_loom_tg16.cpp
    engines/scumm/extract_loom_tg16.h
    engines/scumm/extract_mm_apple.cpp
    engines/scumm/extract_mm_apple.h
    engines/scumm/extract_mm_c64.cpp
    engines/scumm/extract_mm_c64.h
    engines/scumm/extract_mm_nes.cpp
    engines/scumm/extract_mm_nes.h
    engines/scumm/extract_scumm_mac.cpp
    engines/scumm/extract_scumm_mac.h
    engines/scumm/extract_zak_c64.cpp
    engines/scumm/extract_zak_c64.h
    engines/sword1/compress_sword1.cpp
    engines/sword1/compress_sword1.h
    engines/sword2/compress_sword2.cpp
    engines/sword2/compress_sword2.h
    engines/sword2/desword2.cpp
    engines/sword2/sword2_clue.cpp
    engines/tinsel/compress_tinsel.cpp
    engines/tinsel/compress_tinsel.h
    engines/touche/compress_touche.cpp
    engines/touche/compress_touche.h
    engines/tucker/compress_tucker.cpp
    engines/tucker/compress_tucker.h
    example_tool.cpp
    gui/configuration.cpp
    gui/configuration.h
    gui/gui_tools.cpp
    gui/gui_tools.h
    gui/main.cpp
    gui/main.h
    gui/pages.cpp
    gui/pages.h
    main_cli.cpp
    sci/graphics_png.h
    sci/listwords.cpp
    sci/musicplayer.cpp
    sci/old_objects.cpp
    sci/old_objects.h
    sci/scidisasm.cpp
    sci/scipack.cpp
    sci/sciunpack.cpp
    sci/sciunpack.h
    sci/scriptdump.cpp
    sci/util.h
    sci/vocabdump.cpp
    scummvm-tools-cli.cpp
    scummvm-tools-cli.h
    sound/adpcm.cpp
    sound/adpcm.h
    sound/audiostream.cpp
    sound/audiostream.h
    sound/voc.cpp
    sound/voc.h
    sound/wave.cpp
    sound/wave.h
    tool.cpp
    tool.h
    tool_exception.h
    tools.cpp
    tools.h
    version.cpp
    version.h



diff --git a/Makefile b/Makefile
index b480aa8..cc56f59 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,3 @@
-# $URL$
-# $Id$
-
 #######################################################################
 # Default compilation parameters. Normally don't edit these           #
 #######################################################################
diff --git a/Makefile.common b/Makefile.common
index 953eba7..7955890 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,8 +1,5 @@
 # This file is used by Makefile and declares common build rules,
 # a list of common object files etc.
-#
-# $URL$
-# $Id$
 
 
 ######################################################################
diff --git a/common/algorithm.h b/common/algorithm.h
index 70e74e5..405ad88 100644
--- a/common/algorithm.h
+++ b/common/algorithm.h
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
  */
 
 #ifndef COMMON_ALGORITHM_H
diff --git a/common/array.h b/common/array.h
index 4cc5369..244b385 100644
--- a/common/array.h
+++ b/common/array.h
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
  */
 
 #ifndef COMMON_ARRAY_H
diff --git a/common/endian.h b/common/endian.h
index f62a746..801f1d5 100644
--- a/common/endian.h
+++ b/common/endian.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMMON_ENDIAN_H
diff --git a/common/file.cpp b/common/file.cpp
index 2faa28d..441bca9 100644
--- a/common/file.cpp
+++ b/common/file.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "file.h"
diff --git a/common/file.h b/common/file.h
index 8956a63..470c9b3 100644
--- a/common/file.h
+++ b/common/file.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMMON_FILE_H
diff --git a/common/func.h b/common/func.h
index b89a64e..e09ab1a 100644
--- a/common/func.h
+++ b/common/func.h
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
  */
 
 #ifndef COMMON_FUNC_H
diff --git a/common/hash-str.h b/common/hash-str.h
index 4055703..1b8a578 100644
--- a/common/hash-str.h
+++ b/common/hash-str.h
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
  */
 
 #ifndef COMMON_HASH_STR_H
diff --git a/common/hashmap.cpp b/common/hashmap.cpp
index d8b84f6..088508f 100644
--- a/common/hashmap.cpp
+++ b/common/hashmap.cpp
@@ -8,19 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 // The hash map (associative array) implementation in this file is
diff --git a/common/hashmap.h b/common/hashmap.h
index c32d275..1dcfa81 100644
--- a/common/hashmap.h
+++ b/common/hashmap.h
@@ -8,19 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 // The hash map (associative array) implementation in this file is
diff --git a/common/md5.cpp b/common/md5.cpp
index 220ce84..de541bd 100644
--- a/common/md5.cpp
+++ b/common/md5.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/md5.h"
diff --git a/common/md5.h b/common/md5.h
index b8ac9d6..a782a48 100644
--- a/common/md5.h
+++ b/common/md5.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMMON_MD5_H
diff --git a/common/memorypool.cpp b/common/memorypool.cpp
index 6abe805..f961f4f 100644
--- a/common/memorypool.cpp
+++ b/common/memorypool.cpp
@@ -8,19 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/memorypool.h"
diff --git a/common/memorypool.h b/common/memorypool.h
index ea19a5f..cc360eb 100644
--- a/common/memorypool.h
+++ b/common/memorypool.h
@@ -8,19 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMMON_MEMORYPOOL_H
diff --git a/common/noncopyable.h b/common/noncopyable.h
index f639d9a..db552c0 100644
--- a/common/noncopyable.h
+++ b/common/noncopyable.h
@@ -8,19 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMMON_NONCOPYABLE_H
diff --git a/common/pack-end.h b/common/pack-end.h
index 811121b..ada0f8d 100644
--- a/common/pack-end.h
+++ b/common/pack-end.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #if defined(SCUMMVM_USE_PRAGMA_PACK)
diff --git a/common/pack-start.h b/common/pack-start.h
index 4d19b7c..85049b4 100644
--- a/common/pack-start.h
+++ b/common/pack-start.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #if defined(SCUMMVM_USE_PRAGMA_PACK)
diff --git a/common/scummsys.h b/common/scummsys.h
index 164d42c..2067760 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMMON_SCUMMSYS_H
diff --git a/common/str.cpp b/common/str.cpp
index 6dd5d91..c9bd024 100644
--- a/common/str.cpp
+++ b/common/str.cpp
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
  */
 
 #include "common/str.h"
diff --git a/common/str.h b/common/str.h
index 60103e0..bb7fd21 100644
--- a/common/str.h
+++ b/common/str.h
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
  */
 
 #ifndef COMMON_STRING_H
diff --git a/common/util.cpp b/common/util.cpp
index 9481a2f..b5289c2 100644
--- a/common/util.cpp
+++ b/common/util.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/util.h"
diff --git a/common/util.h b/common/util.h
index 8b67e29..dd5b26a 100644
--- a/common/util.h
+++ b/common/util.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMMON_UTIL_H
diff --git a/compress.cpp b/compress.cpp
index 62604b1..76d9790 100644
--- a/compress.cpp
+++ b/compress.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <assert.h>
diff --git a/compress.h b/compress.h
index abc89d3..ac9ba5c 100644
--- a/compress.h
+++ b/compress.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMPRESS_H
diff --git a/create_sjisfnt.cpp b/create_sjisfnt.cpp
index 9ae73b2..27c1d37 100644
--- a/create_sjisfnt.cpp
+++ b/create_sjisfnt.cpp
@@ -8,16 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
  */
 
 #include "create_sjisfnt.h"
diff --git a/create_sjisfnt.h b/create_sjisfnt.h
index 86d2418..6fa2390 100644
--- a/create_sjisfnt.h
+++ b/create_sjisfnt.h
@@ -8,16 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
  */
 
 #ifndef CREATE_SJISFNT_H
diff --git a/decompiler/codegen.cpp b/decompiler/codegen.cpp
index 0ffcac3..04e0855 100644
--- a/decompiler/codegen.cpp
+++ b/decompiler/codegen.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "codegen.h"
diff --git a/decompiler/codegen.h b/decompiler/codegen.h
index 3fa9fa9..1f2a0f9 100644
--- a/decompiler/codegen.h
+++ b/decompiler/codegen.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "graph.h"
diff --git a/decompiler/control_flow.cpp b/decompiler/control_flow.cpp
index 3e7e4f9..a3eaae0 100644
--- a/decompiler/control_flow.cpp
+++ b/decompiler/control_flow.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "control_flow.h"
diff --git a/decompiler/control_flow.h b/decompiler/control_flow.h
index a8842af..263c0cf 100644
--- a/decompiler/control_flow.h
+++ b/decompiler/control_flow.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef DEC_CONTROL_FLOW_H
diff --git a/decompiler/decompiler.cpp b/decompiler/decompiler.cpp
index 74909f2..dfa22f9 100644
--- a/decompiler/decompiler.cpp
+++ b/decompiler/decompiler.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "objectFactory.h"
diff --git a/decompiler/disassembler.cpp b/decompiler/disassembler.cpp
index 4d137a7..fde928b 100644
--- a/decompiler/disassembler.cpp
+++ b/decompiler/disassembler.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "disassembler.h"
diff --git a/decompiler/disassembler.h b/decompiler/disassembler.h
index cbf8acf..da3ef34 100644
--- a/decompiler/disassembler.h
+++ b/decompiler/disassembler.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef DEC_DISASSEMBLER_H
diff --git a/decompiler/engine.h b/decompiler/engine.h
index 8045dfe..57c0e8c 100644
--- a/decompiler/engine.h
+++ b/decompiler/engine.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef ENGINE_H
diff --git a/decompiler/graph.cpp b/decompiler/graph.cpp
index 481e80e..80443e3 100644
--- a/decompiler/graph.cpp
+++ b/decompiler/graph.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "graph.h"
diff --git a/decompiler/graph.h b/decompiler/graph.h
index 342be3b..9e3c4ff 100644
--- a/decompiler/graph.h
+++ b/decompiler/graph.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef DEC_GRAPH_H
diff --git a/decompiler/groovie/disassembler.cpp b/decompiler/groovie/disassembler.cpp
index 4d07e59..91c8a1f 100644
--- a/decompiler/groovie/disassembler.cpp
+++ b/decompiler/groovie/disassembler.cpp
@@ -1,24 +1,20 @@
 /* ScummVM Tools
-* Copyright (C) 2010 The ScummVM project
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-
-* 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.  See the
-* GNU General Public License for more details.
-
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-* $URL$
-* $Id$
-*
-*/
+ * Copyright (C) 2010 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * 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.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
 
 #include "disassembler.h"
 #include "opcodes.h"
diff --git a/decompiler/groovie/disassembler.h b/decompiler/groovie/disassembler.h
index b3ffa53..27a0f38 100644
--- a/decompiler/groovie/disassembler.h
+++ b/decompiler/groovie/disassembler.h
@@ -1,24 +1,20 @@
 /* ScummVM Tools
-* Copyright (C) 2010 The ScummVM project
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-
-* 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.  See the
-* GNU General Public License for more details.
-
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-* $URL$
-* $Id$
-*
-*/
+ * Copyright (C) 2010 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * 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.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
 
 #ifndef GROOVIE_DISASSEMBLER_H
 #define GROOVIE_DISASSEMBLER_H
diff --git a/decompiler/groovie/engine.cpp b/decompiler/groovie/engine.cpp
index a3c204a..2e94a5a 100644
--- a/decompiler/groovie/engine.cpp
+++ b/decompiler/groovie/engine.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "engine.h"
diff --git a/decompiler/groovie/engine.h b/decompiler/groovie/engine.h
index a566c69..f493b50 100644
--- a/decompiler/groovie/engine.h
+++ b/decompiler/groovie/engine.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef GROOVIE_ENGINE_H
diff --git a/decompiler/groovie/opcodes.h b/decompiler/groovie/opcodes.h
index 07b9c8e..9cda060 100644
--- a/decompiler/groovie/opcodes.h
+++ b/decompiler/groovie/opcodes.h
@@ -1,24 +1,20 @@
 /* ScummVM Tools
-* Copyright (C) 2010 The ScummVM project
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-
-* 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.  See the
-* GNU General Public License for more details.
-
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-* $URL$
-* $Id$
-*
-*/
+ * Copyright (C) 2010 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * 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.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
 
 namespace Groovie {
 
diff --git a/decompiler/instruction.cpp b/decompiler/instruction.cpp
index d06b53e..458fc0c 100644
--- a/decompiler/instruction.cpp
+++ b/decompiler/instruction.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "instruction.h"
diff --git a/decompiler/instruction.h b/decompiler/instruction.h
index b6142ed..46a7652 100644
--- a/decompiler/instruction.h
+++ b/decompiler/instruction.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef DEC_INSTRUCTION_H
diff --git a/decompiler/kyra/codegen.cpp b/decompiler/kyra/codegen.cpp
index bdebcdc..82d62c7 100644
--- a/decompiler/kyra/codegen.cpp
+++ b/decompiler/kyra/codegen.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "codegen.h"
diff --git a/decompiler/kyra/codegen.h b/decompiler/kyra/codegen.h
index 5bfd936..51dc58e 100644
--- a/decompiler/kyra/codegen.h
+++ b/decompiler/kyra/codegen.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef DEC_KYRA_CODEGEN_H
diff --git a/decompiler/kyra/disassembler.cpp b/decompiler/kyra/disassembler.cpp
index ec92a69..6f6e759 100644
--- a/decompiler/kyra/disassembler.cpp
+++ b/decompiler/kyra/disassembler.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "disassembler.h"
diff --git a/decompiler/kyra/disassembler.h b/decompiler/kyra/disassembler.h
index 5749745..b9e0df0 100644
--- a/decompiler/kyra/disassembler.h
+++ b/decompiler/kyra/disassembler.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef DEC_KYRA_DISASM_H
diff --git a/decompiler/kyra/engine.cpp b/decompiler/kyra/engine.cpp
index 746d2bd..e7d8d21 100644
--- a/decompiler/kyra/engine.cpp
+++ b/decompiler/kyra/engine.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "engine.h"
diff --git a/decompiler/kyra/engine.h b/decompiler/kyra/engine.h
index 6ed49ad..660456a 100644
--- a/decompiler/kyra/engine.h
+++ b/decompiler/kyra/engine.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef KYRA_ENGINE_H
diff --git a/decompiler/objectFactory.h b/decompiler/objectFactory.h
index d0b3b13..fcd86d0 100644
--- a/decompiler/objectFactory.h
+++ b/decompiler/objectFactory.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef DEC_OBJECTFACTORY_H
diff --git a/decompiler/refcounted.h b/decompiler/refcounted.h
index f4d9020..b93e3bb 100644
--- a/decompiler/refcounted.h
+++ b/decompiler/refcounted.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef REFCOUNTED_H
diff --git a/decompiler/scummv6/codegen.cpp b/decompiler/scummv6/codegen.cpp
index f7c6085..f8fc84c 100644
--- a/decompiler/scummv6/codegen.cpp
+++ b/decompiler/scummv6/codegen.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "codegen.h"
diff --git a/decompiler/scummv6/codegen.h b/decompiler/scummv6/codegen.h
index 1c613b6..fdb9f29 100644
--- a/decompiler/scummv6/codegen.h
+++ b/decompiler/scummv6/codegen.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SCUMM_V6_CODEGEN_H
diff --git a/decompiler/scummv6/disassembler.cpp b/decompiler/scummv6/disassembler.cpp
index 66ae14b..22c9f47 100644
--- a/decompiler/scummv6/disassembler.cpp
+++ b/decompiler/scummv6/disassembler.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <iostream>
diff --git a/decompiler/scummv6/disassembler.h b/decompiler/scummv6/disassembler.h
index 86ef78b..1d48d86 100644
--- a/decompiler/scummv6/disassembler.h
+++ b/decompiler/scummv6/disassembler.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef DEC_SCUMMV6_DISASM_H
diff --git a/decompiler/scummv6/engine.cpp b/decompiler/scummv6/engine.cpp
index 0c9d850..57b086f 100644
--- a/decompiler/scummv6/engine.cpp
+++ b/decompiler/scummv6/engine.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "engine.h"
diff --git a/decompiler/scummv6/engine.h b/decompiler/scummv6/engine.h
index b1a7b4d..28a60aa 100644
--- a/decompiler/scummv6/engine.h
+++ b/decompiler/scummv6/engine.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SCUMM_V6_ENGINE_H
diff --git a/decompiler/simple_disassembler.cpp b/decompiler/simple_disassembler.cpp
index 06d6798..cb0d67d 100644
--- a/decompiler/simple_disassembler.cpp
+++ b/decompiler/simple_disassembler.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "simple_disassembler.h"
diff --git a/decompiler/simple_disassembler.h b/decompiler/simple_disassembler.h
index 0259883..0603736 100644
--- a/decompiler/simple_disassembler.h
+++ b/decompiler/simple_disassembler.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef DEC_SIMPLE_DISASSEMBLER_H
diff --git a/decompiler/stack.h b/decompiler/stack.h
index f23e959..a94f35e 100644
--- a/decompiler/stack.h
+++ b/decompiler/stack.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef DEC_STACK_H
diff --git a/decompiler/test/cfg_test.h b/decompiler/test/cfg_test.h
index 0930819..9298a7a 100644
--- a/decompiler/test/cfg_test.h
+++ b/decompiler/test/cfg_test.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <cxxtest/TestSuite.h>
diff --git a/decompiler/test/codegen.h b/decompiler/test/codegen.h
index 8340520..1049d19 100644
--- a/decompiler/test/codegen.h
+++ b/decompiler/test/codegen.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <cxxtest/TestSuite.h>
diff --git a/decompiler/test/disassembler/pasc.cpp b/decompiler/test/disassembler/pasc.cpp
index 5ba3589..e6f757e 100644
--- a/decompiler/test/disassembler/pasc.cpp
+++ b/decompiler/test/disassembler/pasc.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "pasc.h"
diff --git a/decompiler/test/disassembler/pasc.h b/decompiler/test/disassembler/pasc.h
index 28998db..87bf5ec 100644
--- a/decompiler/test/disassembler/pasc.h
+++ b/decompiler/test/disassembler/pasc.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef DEC_TEST_DISASM_PASC_H
diff --git a/decompiler/test/disassembler/subopcode.cpp b/decompiler/test/disassembler/subopcode.cpp
index 53933ee..bf5ad71 100644
--- a/decompiler/test/disassembler/subopcode.cpp
+++ b/decompiler/test/disassembler/subopcode.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "subopcode.h"
diff --git a/decompiler/test/disassembler/subopcode.h b/decompiler/test/disassembler/subopcode.h
index a08e3c1..9a6c266 100644
--- a/decompiler/test/disassembler/subopcode.h
+++ b/decompiler/test/disassembler/subopcode.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef DEC_TEST_DISASM_SUBOPCODE_H
diff --git a/decompiler/test/disassembler_test.h b/decompiler/test/disassembler_test.h
index 1d78279..8d21e80 100644
--- a/decompiler/test/disassembler_test.h
+++ b/decompiler/test/disassembler_test.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <cxxtest/TestSuite.h>
diff --git a/decompiler/unknown_opcode.cpp b/decompiler/unknown_opcode.cpp
index 4ac7b67..4c61adf 100644
--- a/decompiler/unknown_opcode.cpp
+++ b/decompiler/unknown_opcode.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "unknown_opcode.h"
diff --git a/decompiler/unknown_opcode.h b/decompiler/unknown_opcode.h
index 322012c..77e7b2a 100644
--- a/decompiler/unknown_opcode.h
+++ b/decompiler/unknown_opcode.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef DEC_UNKNOWN_OPCODE_H
diff --git a/decompiler/value.cpp b/decompiler/value.cpp
index 9c07ea1..cdef84c 100644
--- a/decompiler/value.cpp
+++ b/decompiler/value.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "value.h"
diff --git a/decompiler/value.h b/decompiler/value.h
index eaa5273..a70fcbf 100644
--- a/decompiler/value.h
+++ b/decompiler/value.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef VALUE_H
diff --git a/decompiler/wrongtype.h b/decompiler/wrongtype.h
index 85b1513..59863ac 100644
--- a/decompiler/wrongtype.h
+++ b/decompiler/wrongtype.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef WRONGTYPE_H
diff --git a/encode_dxa.cpp b/encode_dxa.cpp
index 931edfb..c9843b2 100644
--- a/encode_dxa.cpp
+++ b/encode_dxa.cpp
@@ -6,19 +6,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <stdlib.h>
diff --git a/encode_dxa.h b/encode_dxa.h
index 05d3ef0..87f9b15 100644
--- a/encode_dxa.h
+++ b/encode_dxa.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 
diff --git a/engines/agos/compress_agos.cpp b/engines/agos/compress_agos.cpp
index c6678e1..e9bdecc 100644
--- a/engines/agos/compress_agos.cpp
+++ b/engines/agos/compress_agos.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <string.h>
diff --git a/engines/agos/compress_agos.h b/engines/agos/compress_agos.h
index eb7d2fd..4f6e8bb 100644
--- a/engines/agos/compress_agos.h
+++ b/engines/agos/compress_agos.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMPRESS_AGOS_H
diff --git a/engines/agos/extract_agos.cpp b/engines/agos/extract_agos.cpp
index db5f9d6..c9812b6 100644
--- a/engines/agos/extract_agos.cpp
+++ b/engines/agos/extract_agos.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <stdlib.h>
diff --git a/engines/agos/extract_agos.h b/engines/agos/extract_agos.h
index 6e2fe95..80034cb 100644
--- a/engines/agos/extract_agos.h
+++ b/engines/agos/extract_agos.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef EXTRACT_AGOS_H
diff --git a/engines/cge/cge_structs.h b/engines/cge/cge_structs.h
index 7677476..da4585b 100644
--- a/engines/cge/cge_structs.h
+++ b/engines/cge/cge_structs.h
@@ -8,16 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
  */
 
 #ifndef CGE_STRUCTS_H
diff --git a/engines/cge/extract_cge.cpp b/engines/cge/extract_cge.cpp
index 81b275d..2afd030 100644
--- a/engines/cge/extract_cge.cpp
+++ b/engines/cge/extract_cge.cpp
@@ -8,16 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
  */
 
 #include <stdio.h>
diff --git a/engines/cge/extract_cge.h b/engines/cge/extract_cge.h
index 2a35138..212fa26 100644
--- a/engines/cge/extract_cge.h
+++ b/engines/cge/extract_cge.h
@@ -8,16 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
  */
 
 #ifndef EXTRACT_CGE_H
diff --git a/engines/cge/pack_cge.cpp b/engines/cge/pack_cge.cpp
index df8ed5f..44cb3f0 100644
--- a/engines/cge/pack_cge.cpp
+++ b/engines/cge/pack_cge.cpp
@@ -8,16 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
  */
 
 #include <stdio.h>
diff --git a/engines/cge/pack_cge.h b/engines/cge/pack_cge.h
index a52540d..a5ac3ac 100644
--- a/engines/cge/pack_cge.h
+++ b/engines/cge/pack_cge.h
@@ -8,16 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
  */
 
 #ifndef PACK_CGE_H
diff --git a/engines/cine/decine.cpp b/engines/cine/decine.cpp
index d024656..7423f3c 100644
--- a/engines/cine/decine.cpp
+++ b/engines/cine/decine.cpp
@@ -8,19 +8,16 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * This is a utility to decode Delphine's Cinematique engine's script files.
  * The script files can be recognized from their extension .prc or .rel.
  * Should at least work with Future Wars and Operation Stealth.
diff --git a/engines/cine/extract_cine.cpp b/engines/cine/extract_cine.cpp
index 0224a41..0661af3 100644
--- a/engines/cine/extract_cine.cpp
+++ b/engines/cine/extract_cine.cpp
@@ -8,19 +8,16 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * This is a utility to unpack Delphine's Cinematique engine's archive files.
  * Should at least work with Future Wars and Operation Stealth.
  * Supports using Operation Stealth's 'vol.cnf' file as input for selecting
diff --git a/engines/cine/extract_cine.h b/engines/cine/extract_cine.h
index 5d60195..da102a6 100644
--- a/engines/cine/extract_cine.h
+++ b/engines/cine/extract_cine.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef EXTRACT_CINE_H
diff --git a/engines/cruise/extract_cruise_pc.cpp b/engines/cruise/extract_cruise_pc.cpp
index 4ffcba6..9493b89 100644
--- a/engines/cruise/extract_cruise_pc.cpp
+++ b/engines/cruise/extract_cruise_pc.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <stdarg.h>
diff --git a/engines/cruise/extract_cruise_pc.h b/engines/cruise/extract_cruise_pc.h
index 815ad53..de7c4e2 100644
--- a/engines/cruise/extract_cruise_pc.h
+++ b/engines/cruise/extract_cruise_pc.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef EXTRACT_CRUISE_PC_H
diff --git a/engines/gob/compress_gob.cpp b/engines/gob/compress_gob.cpp
index 659f4a6..f9229cb 100644
--- a/engines/gob/compress_gob.cpp
+++ b/engines/gob/compress_gob.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <string.h>
diff --git a/engines/gob/compress_gob.h b/engines/gob/compress_gob.h
index 4e4212a..c5d1d06 100644
--- a/engines/gob/compress_gob.h
+++ b/engines/gob/compress_gob.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMPRESS_GOB_H
diff --git a/engines/gob/degob.cpp b/engines/gob/degob.cpp
index 1378638..c5aa327 100644
--- a/engines/gob/degob.cpp
+++ b/engines/gob/degob.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <string.h>
diff --git a/engines/gob/degob_script.cpp b/engines/gob/degob_script.cpp
index a9fb1cd..6c5ea9f 100644
--- a/engines/gob/degob_script.cpp
+++ b/engines/gob/degob_script.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <assert.h>
diff --git a/engines/gob/degob_script.h b/engines/gob/degob_script.h
index cb6fcc1..aeb2b69 100644
--- a/engines/gob/degob_script.h
+++ b/engines/gob/degob_script.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef DEGOB_SCRIPT_H
diff --git a/engines/gob/degob_script_bargon.cpp b/engines/gob/degob_script_bargon.cpp
index fdeb05c..c50061d 100644
--- a/engines/gob/degob_script_bargon.cpp
+++ b/engines/gob/degob_script_bargon.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "degob_script.h"
diff --git a/engines/gob/degob_script_fascin.cpp b/engines/gob/degob_script_fascin.cpp
index 1ac4dc9..e3db4f0 100644
--- a/engines/gob/degob_script_fascin.cpp
+++ b/engines/gob/degob_script_fascin.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "degob_script.h"
diff --git a/engines/gob/degob_script_geisha.cpp b/engines/gob/degob_script_geisha.cpp
index 5282555..38d073c 100644
--- a/engines/gob/degob_script_geisha.cpp
+++ b/engines/gob/degob_script_geisha.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "degob_script.h"
diff --git a/engines/gob/degob_script_littlered.cpp b/engines/gob/degob_script_littlered.cpp
index 9edbff3..920c988 100644
--- a/engines/gob/degob_script_littlered.cpp
+++ b/engines/gob/degob_script_littlered.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "degob_script.h"
diff --git a/engines/gob/degob_script_v1.cpp b/engines/gob/degob_script_v1.cpp
index 63154f4..71c1800 100644
--- a/engines/gob/degob_script_v1.cpp
+++ b/engines/gob/degob_script_v1.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "degob_script.h"
diff --git a/engines/gob/degob_script_v2.cpp b/engines/gob/degob_script_v2.cpp
index fff86b7..ec560a7 100644
--- a/engines/gob/degob_script_v2.cpp
+++ b/engines/gob/degob_script_v2.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "degob_script.h"
diff --git a/engines/gob/degob_script_v3.cpp b/engines/gob/degob_script_v3.cpp
index a55e70e..a66e1ac 100644
--- a/engines/gob/degob_script_v3.cpp
+++ b/engines/gob/degob_script_v3.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "degob_script.h"
diff --git a/engines/gob/degob_script_v4.cpp b/engines/gob/degob_script_v4.cpp
index f0e1bba..6d73083 100644
--- a/engines/gob/degob_script_v4.cpp
+++ b/engines/gob/degob_script_v4.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "degob_script.h"
diff --git a/engines/gob/degob_script_v5.cpp b/engines/gob/degob_script_v5.cpp
index 1e668f7..4efecab 100644
--- a/engines/gob/degob_script_v5.cpp
+++ b/engines/gob/degob_script_v5.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "degob_script.h"
diff --git a/engines/gob/degob_script_v6.cpp b/engines/gob/degob_script_v6.cpp
index 7458954..07885b6 100644
--- a/engines/gob/degob_script_v6.cpp
+++ b/engines/gob/degob_script_v6.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "degob_script.h"
diff --git a/engines/gob/extract_fascination_cd.cpp b/engines/gob/extract_fascination_cd.cpp
index a8ae56e..9801436 100644
--- a/engines/gob/extract_fascination_cd.cpp
+++ b/engines/gob/extract_fascination_cd.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL: $
- * $Id: $
- *
  */
 
 #include "common/endian.h"
diff --git a/engines/gob/extract_fascination_cd.h b/engines/gob/extract_fascination_cd.h
index 999aed2..933b2b4 100644
--- a/engines/gob/extract_fascination_cd.h
+++ b/engines/gob/extract_fascination_cd.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL: $
- * $Id: $
- *
  */
 
 #ifndef EXTRACT_FASCINATION_CD_H
diff --git a/engines/gob/extract_gob_stk.cpp b/engines/gob/extract_gob_stk.cpp
index 7a5647c..e7d43d0 100644
--- a/engines/gob/extract_gob_stk.cpp
+++ b/engines/gob/extract_gob_stk.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <string.h>
diff --git a/engines/gob/extract_gob_stk.h b/engines/gob/extract_gob_stk.h
index d35d2a8..693ea8d 100644
--- a/engines/gob/extract_gob_stk.h
+++ b/engines/gob/extract_gob_stk.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef EXTRACT_GOB_STK_H
diff --git a/engines/gob/gob_loadcalc.cpp b/engines/gob/gob_loadcalc.cpp
index 6a04073..993473a 100644
--- a/engines/gob/gob_loadcalc.cpp
+++ b/engines/gob/gob_loadcalc.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <stdio.h>
diff --git a/engines/kyra/compress_kyra.cpp b/engines/kyra/compress_kyra.cpp
index f7a23ba..9269d16 100644
--- a/engines/kyra/compress_kyra.cpp
+++ b/engines/kyra/compress_kyra.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <assert.h>
diff --git a/engines/kyra/compress_kyra.h b/engines/kyra/compress_kyra.h
index d974c5b..08d63b9 100644
--- a/engines/kyra/compress_kyra.h
+++ b/engines/kyra/compress_kyra.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMPRESS_KYRA_H
diff --git a/engines/kyra/dekyra.cpp b/engines/kyra/dekyra.cpp
index a7cf4f5..de235f0 100644
--- a/engines/kyra/dekyra.cpp
+++ b/engines/kyra/dekyra.cpp
@@ -6,19 +6,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <assert.h>
diff --git a/engines/kyra/dekyra.h b/engines/kyra/dekyra.h
index 15d48f0..43e725a 100644
--- a/engines/kyra/dekyra.h
+++ b/engines/kyra/dekyra.h
@@ -6,19 +6,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef DEKYRA_H
diff --git a/engines/kyra/dekyra_v1.cpp b/engines/kyra/dekyra_v1.cpp
index 501e600..4df1c07 100644
--- a/engines/kyra/dekyra_v1.cpp
+++ b/engines/kyra/dekyra_v1.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <stdio.h>
diff --git a/engines/kyra/extract_kyra.cpp b/engines/kyra/extract_kyra.cpp
index 6860539..0b39b3e 100644
--- a/engines/kyra/extract_kyra.cpp
+++ b/engines/kyra/extract_kyra.cpp
@@ -6,19 +6,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "extract_kyra.h"
diff --git a/engines/kyra/extract_kyra.h b/engines/kyra/extract_kyra.h
index 9bebef8..a102028 100644
--- a/engines/kyra/extract_kyra.h
+++ b/engines/kyra/extract_kyra.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef EXTRACT_KYRA_H
diff --git a/engines/kyra/kyra_ins.cpp b/engines/kyra/kyra_ins.cpp
index aafef38..2056d5f 100644
--- a/engines/kyra/kyra_ins.cpp
+++ b/engines/kyra/kyra_ins.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <assert.h>
diff --git a/engines/kyra/kyra_ins.h b/engines/kyra/kyra_ins.h
index 4faaad4..d8921cb 100644
--- a/engines/kyra/kyra_ins.h
+++ b/engines/kyra/kyra_ins.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef KYRA_INS_H
diff --git a/engines/kyra/kyra_pak.cpp b/engines/kyra/kyra_pak.cpp
index 28a79ee..0a73d91 100644
--- a/engines/kyra/kyra_pak.cpp
+++ b/engines/kyra/kyra_pak.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <assert.h>
diff --git a/engines/kyra/kyra_pak.h b/engines/kyra/kyra_pak.h
index fb61629..d450de8 100644
--- a/engines/kyra/kyra_pak.h
+++ b/engines/kyra/kyra_pak.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef KYRA_PAK_H
diff --git a/engines/mohawk/archive.cpp b/engines/mohawk/archive.cpp
index b4e146a..a2d5db3 100644
--- a/engines/mohawk/archive.cpp
+++ b/engines/mohawk/archive.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "engines/mohawk/archive.h"
diff --git a/engines/mohawk/archive.h b/engines/mohawk/archive.h
index 4d55355..9913cc3 100644
--- a/engines/mohawk/archive.h
+++ b/engines/mohawk/archive.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef MOHAWK_ARCHIVE_H
diff --git a/engines/mohawk/construct_mohawk.cpp b/engines/mohawk/construct_mohawk.cpp
index eee0a72..d467f0f 100644
--- a/engines/mohawk/construct_mohawk.cpp
+++ b/engines/mohawk/construct_mohawk.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/scummsys.h"
diff --git a/engines/mohawk/deriven.cpp b/engines/mohawk/deriven.cpp
index 08678e9..a662432 100644
--- a/engines/mohawk/deriven.cpp
+++ b/engines/mohawk/deriven.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "engines/mohawk/archive.h"
diff --git a/engines/mohawk/extract_mohawk.cpp b/engines/mohawk/extract_mohawk.cpp
index b4e9496..9042287 100644
--- a/engines/mohawk/extract_mohawk.cpp
+++ b/engines/mohawk/extract_mohawk.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "engines/mohawk/archive.h"
diff --git a/engines/parallaction/extract_parallaction.cpp b/engines/parallaction/extract_parallaction.cpp
index 9d2b60f..5b042c8 100644
--- a/engines/parallaction/extract_parallaction.cpp
+++ b/engines/parallaction/extract_parallaction.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <assert.h>
diff --git a/engines/parallaction/extract_parallaction.h b/engines/parallaction/extract_parallaction.h
index 93a10b1..52167b5 100644
--- a/engines/parallaction/extract_parallaction.h
+++ b/engines/parallaction/extract_parallaction.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef EXTRACT_PARALLACTION_H
diff --git a/engines/pegasus/pegasus_save_types.cpp b/engines/pegasus/pegasus_save_types.cpp
index 6b6d5bd..271814e 100755
--- a/engines/pegasus/pegasus_save_types.cpp
+++ b/engines/pegasus/pegasus_save_types.cpp
@@ -5,16 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
  */
 
 #include <stdio.h>
diff --git a/engines/queen/compress_queen.cpp b/engines/queen/compress_queen.cpp
index 58e95aa..280c31d 100644
--- a/engines/queen/compress_queen.cpp
+++ b/engines/queen/compress_queen.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <string.h>
diff --git a/engines/queen/compress_queen.h b/engines/queen/compress_queen.h
index a30275d..596b6fb 100644
--- a/engines/queen/compress_queen.h
+++ b/engines/queen/compress_queen.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMPRESS_QUEEN_H
diff --git a/engines/saga/compress_saga.cpp b/engines/saga/compress_saga.cpp
index 0b5e13e..29877bf 100644
--- a/engines/saga/compress_saga.cpp
+++ b/engines/saga/compress_saga.cpp
@@ -7,19 +7,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <stdlib.h>
diff --git a/engines/saga/compress_saga.h b/engines/saga/compress_saga.h
index d610e02..caa5860 100644
--- a/engines/saga/compress_saga.h
+++ b/engines/saga/compress_saga.h
@@ -7,19 +7,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMPRESS_SAGA_H
diff --git a/engines/sci/compress_sci.cpp b/engines/sci/compress_sci.cpp
index 51374f5..298d74b 100644
--- a/engines/sci/compress_sci.cpp
+++ b/engines/sci/compress_sci.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 // by m_kiewitz
diff --git a/engines/sci/compress_sci.h b/engines/sci/compress_sci.h
index e1e404a..2ce4331 100644
--- a/engines/sci/compress_sci.h
+++ b/engines/sci/compress_sci.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMPRESS_SCI_H
diff --git a/engines/scumm/compress_scumm_bun.cpp b/engines/scumm/compress_scumm_bun.cpp
index e16e5f9..bbdf1ff 100644
--- a/engines/scumm/compress_scumm_bun.cpp
+++ b/engines/scumm/compress_scumm_bun.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <assert.h>
diff --git a/engines/scumm/compress_scumm_bun.h b/engines/scumm/compress_scumm_bun.h
index 38eff00..8a97328 100644
--- a/engines/scumm/compress_scumm_bun.h
+++ b/engines/scumm/compress_scumm_bun.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMPRESS_SCUMM_BUN_H
diff --git a/engines/scumm/compress_scumm_san.cpp b/engines/scumm/compress_scumm_san.cpp
index 842ea7a..dd9122d 100644
--- a/engines/scumm/compress_scumm_san.cpp
+++ b/engines/scumm/compress_scumm_san.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <assert.h>
diff --git a/engines/scumm/compress_scumm_san.h b/engines/scumm/compress_scumm_san.h
index aa1509b..9edc853 100644
--- a/engines/scumm/compress_scumm_san.h
+++ b/engines/scumm/compress_scumm_san.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMPRESS_SCUMM_SAN_H
diff --git a/engines/scumm/compress_scumm_sou.cpp b/engines/scumm/compress_scumm_sou.cpp
index da5af0d..abf625e 100644
--- a/engines/scumm/compress_scumm_sou.cpp
+++ b/engines/scumm/compress_scumm_sou.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <assert.h>
diff --git a/engines/scumm/compress_scumm_sou.h b/engines/scumm/compress_scumm_sou.h
index 4c57f30..8e62b7e 100644
--- a/engines/scumm/compress_scumm_sou.h
+++ b/engines/scumm/compress_scumm_sou.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMPRESS_SCUMM_SOU_H
diff --git a/engines/scumm/descumm-common.cpp b/engines/scumm/descumm-common.cpp
index 44f00b0..bd6ca6c 100644
--- a/engines/scumm/descumm-common.cpp
+++ b/engines/scumm/descumm-common.cpp
@@ -6,19 +6,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <string.h>
diff --git a/engines/scumm/descumm-tool.cpp b/engines/scumm/descumm-tool.cpp
index f2f826c..bb188a0 100644
--- a/engines/scumm/descumm-tool.cpp
+++ b/engines/scumm/descumm-tool.cpp
@@ -6,19 +6,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <ctype.h>
diff --git a/engines/scumm/descumm.cpp b/engines/scumm/descumm.cpp
index fa848ad..99238a8 100644
--- a/engines/scumm/descumm.cpp
+++ b/engines/scumm/descumm.cpp
@@ -6,19 +6,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <stdlib.h>
diff --git a/engines/scumm/descumm.h b/engines/scumm/descumm.h
index 9bdc029..09f05c2 100644
--- a/engines/scumm/descumm.h
+++ b/engines/scumm/descumm.h
@@ -6,19 +6,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef DESCUMM_H
diff --git a/engines/scumm/descumm6.cpp b/engines/scumm/descumm6.cpp
index a7c11b1..3b0452c 100644
--- a/engines/scumm/descumm6.cpp
+++ b/engines/scumm/descumm6.cpp
@@ -6,19 +6,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <stdlib.h>
diff --git a/engines/scumm/extract_loom_tg16.cpp b/engines/scumm/extract_loom_tg16.cpp
index 7d2d3c1..1015266 100644
--- a/engines/scumm/extract_loom_tg16.cpp
+++ b/engines/scumm/extract_loom_tg16.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <string.h>
diff --git a/engines/scumm/extract_loom_tg16.h b/engines/scumm/extract_loom_tg16.h
index c229d54..e53943d 100644
--- a/engines/scumm/extract_loom_tg16.h
+++ b/engines/scumm/extract_loom_tg16.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef EXTRACT_LOOM_TG16_H
diff --git a/engines/scumm/extract_mm_apple.cpp b/engines/scumm/extract_mm_apple.cpp
index 1ef9e5a..3f8a337 100644
--- a/engines/scumm/extract_mm_apple.cpp
+++ b/engines/scumm/extract_mm_apple.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <stdarg.h>
diff --git a/engines/scumm/extract_mm_apple.h b/engines/scumm/extract_mm_apple.h
index bc516de..b19bbab 100644
--- a/engines/scumm/extract_mm_apple.h
+++ b/engines/scumm/extract_mm_apple.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef EXTRACT_MM_APPLE_H
diff --git a/engines/scumm/extract_mm_c64.cpp b/engines/scumm/extract_mm_c64.cpp
index 3a91af9..26de399 100644
--- a/engines/scumm/extract_mm_c64.cpp
+++ b/engines/scumm/extract_mm_c64.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <stdarg.h>
diff --git a/engines/scumm/extract_mm_c64.h b/engines/scumm/extract_mm_c64.h
index 287ecc2..0161923 100644
--- a/engines/scumm/extract_mm_c64.h
+++ b/engines/scumm/extract_mm_c64.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef EXTRACT_MM_C64_H
diff --git a/engines/scumm/extract_mm_nes.cpp b/engines/scumm/extract_mm_nes.cpp
index 09ced31..b347bd1 100644
--- a/engines/scumm/extract_mm_nes.cpp
+++ b/engines/scumm/extract_mm_nes.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <string.h>
diff --git a/engines/scumm/extract_mm_nes.h b/engines/scumm/extract_mm_nes.h
index 1ea54ca..ec43e01 100644
--- a/engines/scumm/extract_mm_nes.h
+++ b/engines/scumm/extract_mm_nes.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef EXTRACT_MM_NES_H
diff --git a/engines/scumm/extract_scumm_mac.cpp b/engines/scumm/extract_scumm_mac.cpp
index fe337d5..b0c2099 100644
--- a/engines/scumm/extract_scumm_mac.cpp
+++ b/engines/scumm/extract_scumm_mac.cpp
@@ -6,19 +6,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "extract_scumm_mac.h"
diff --git a/engines/scumm/extract_scumm_mac.h b/engines/scumm/extract_scumm_mac.h
index f80b24a..9545c87 100644
--- a/engines/scumm/extract_scumm_mac.h
+++ b/engines/scumm/extract_scumm_mac.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 
diff --git a/engines/scumm/extract_zak_c64.cpp b/engines/scumm/extract_zak_c64.cpp
index c5a0f14..010eb30 100644
--- a/engines/scumm/extract_zak_c64.cpp
+++ b/engines/scumm/extract_zak_c64.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <stdio.h>
diff --git a/engines/scumm/extract_zak_c64.h b/engines/scumm/extract_zak_c64.h
index 364083a..3ca47c2 100644
--- a/engines/scumm/extract_zak_c64.h
+++ b/engines/scumm/extract_zak_c64.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef EXTRACT_ZAK_C64_H
diff --git a/engines/sword1/compress_sword1.cpp b/engines/sword1/compress_sword1.cpp
index e3e54fa..5af6f2e 100644
--- a/engines/sword1/compress_sword1.cpp
+++ b/engines/sword1/compress_sword1.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <assert.h>
diff --git a/engines/sword1/compress_sword1.h b/engines/sword1/compress_sword1.h
index f6704dd..8770572 100644
--- a/engines/sword1/compress_sword1.h
+++ b/engines/sword1/compress_sword1.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMPRESS_SWORD1_H
diff --git a/engines/sword2/compress_sword2.cpp b/engines/sword2/compress_sword2.cpp
index e7d0599..1539b1d 100644
--- a/engines/sword2/compress_sword2.cpp
+++ b/engines/sword2/compress_sword2.cpp
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 
diff --git a/engines/sword2/compress_sword2.h b/engines/sword2/compress_sword2.h
index a908c58..24f3b7b 100644
--- a/engines/sword2/compress_sword2.h
+++ b/engines/sword2/compress_sword2.h
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMPRESS_SWORD2_H
diff --git a/engines/sword2/desword2.cpp b/engines/sword2/desword2.cpp
index 83b543d..d186036 100644
--- a/engines/sword2/desword2.cpp
+++ b/engines/sword2/desword2.cpp
@@ -14,10 +14,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <stdlib.h>
diff --git a/engines/sword2/sword2_clue.cpp b/engines/sword2/sword2_clue.cpp
index 9985b9a..6189b0d 100644
--- a/engines/sword2/sword2_clue.cpp
+++ b/engines/sword2/sword2_clue.cpp
@@ -5,20 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-.
- *
- * $URL$
- * $Id$
- *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "common/file.h"
diff --git a/engines/tinsel/compress_tinsel.cpp b/engines/tinsel/compress_tinsel.cpp
index 4505271..f89397c 100644
--- a/engines/tinsel/compress_tinsel.cpp
+++ b/engines/tinsel/compress_tinsel.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 // By Jimi (m [underline] kiewitz [AT] users.sourceforge.net)
diff --git a/engines/tinsel/compress_tinsel.h b/engines/tinsel/compress_tinsel.h
index d8f3fcf..952a5e8 100644
--- a/engines/tinsel/compress_tinsel.h
+++ b/engines/tinsel/compress_tinsel.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMPRESS_TINSEL_H
diff --git a/engines/touche/compress_touche.cpp b/engines/touche/compress_touche.cpp
index 4275ee8..143d5a7 100644
--- a/engines/touche/compress_touche.cpp
+++ b/engines/touche/compress_touche.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <string.h>
diff --git a/engines/touche/compress_touche.h b/engines/touche/compress_touche.h
index b777d9f..432acb7 100644
--- a/engines/touche/compress_touche.h
+++ b/engines/touche/compress_touche.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMPRESS_TOUCHE_H
diff --git a/engines/tucker/compress_tucker.cpp b/engines/tucker/compress_tucker.cpp
index 476ebc3..2235ff6 100644
--- a/engines/tucker/compress_tucker.cpp
+++ b/engines/tucker/compress_tucker.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <assert.h>
diff --git a/engines/tucker/compress_tucker.h b/engines/tucker/compress_tucker.h
index 2a79f45..5c05f1a 100644
--- a/engines/tucker/compress_tucker.h
+++ b/engines/tucker/compress_tucker.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMPRESS_TUCKER_H
diff --git a/example_tool.cpp b/example_tool.cpp
index 226270d..74df25e 100644
--- a/example_tool.cpp
+++ b/example_tool.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 /* Example of a compression tool
diff --git a/gui/configuration.cpp b/gui/configuration.cpp
index ccc7a1e..1fb4d64 100644
--- a/gui/configuration.cpp
+++ b/gui/configuration.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <wx/config.h>
diff --git a/gui/configuration.h b/gui/configuration.h
index 9b41915..b57dda3 100644
--- a/gui/configuration.h
+++ b/gui/configuration.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef GUI_CONFIGURATION_H
diff --git a/gui/gui_tools.cpp b/gui/gui_tools.cpp
index 8b98693..16b47b4 100644
--- a/gui/gui_tools.cpp
+++ b/gui/gui_tools.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL
- * $Id
- *
  */
 
 #include "wx/wxprec.h"
diff --git a/gui/gui_tools.h b/gui/gui_tools.h
index 387d5aa..15b9515 100644
--- a/gui/gui_tools.h
+++ b/gui/gui_tools.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef GUI_TOOLS_H
diff --git a/gui/main.cpp b/gui/main.cpp
index 82edbab..8f37201 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "wx/wxprec.h"
diff --git a/gui/main.h b/gui/main.h
index e3e1f8f..33000bb 100644
--- a/gui/main.h
+++ b/gui/main.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef GUI_MAIN_H
diff --git a/gui/pages.cpp b/gui/pages.cpp
index c6660d5..b40c789 100644
--- a/gui/pages.cpp
+++ b/gui/pages.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL
- * $Id
- *
  */
 
 #include "wx/wxprec.h"
diff --git a/gui/pages.h b/gui/pages.h
index ce5457b..8829d74 100644
--- a/gui/pages.h
+++ b/gui/pages.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <wx/wx.h>
diff --git a/main_cli.cpp b/main_cli.cpp
index 6c35031..78e85d1 100644
--- a/main_cli.cpp
+++ b/main_cli.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "scummvm-tools-cli.h"
diff --git a/sci/graphics_png.h b/sci/graphics_png.h
index 8435847..3a174e3 100644
--- a/sci/graphics_png.h
+++ b/sci/graphics_png.h
@@ -8,19 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 /* Provides facilities for writing pictures and seperate views to .png files */
diff --git a/sci/listwords.cpp b/sci/listwords.cpp
index 3951a1e..880a88b 100644
--- a/sci/listwords.cpp
+++ b/sci/listwords.cpp
@@ -8,19 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "sciunpack.h"
diff --git a/sci/musicplayer.cpp b/sci/musicplayer.cpp
index 139ce45..6090d17 100644
--- a/sci/musicplayer.cpp
+++ b/sci/musicplayer.cpp
@@ -8,19 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/sci/old_objects.cpp b/sci/old_objects.cpp
index 048a0fd..b35a7de 100644
--- a/sci/old_objects.cpp
+++ b/sci/old_objects.cpp
@@ -8,19 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <sciresource.h>
diff --git a/sci/old_objects.h b/sci/old_objects.h
index fe653a7..1ec2ded 100644
--- a/sci/old_objects.h
+++ b/sci/old_objects.h
@@ -8,19 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef OLD_OBJECTS_H
diff --git a/sci/scidisasm.cpp b/sci/scidisasm.cpp
index 39ea7f9..cbff209 100644
--- a/sci/scidisasm.cpp
+++ b/sci/scidisasm.cpp
@@ -8,19 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/sci/scipack.cpp b/sci/scipack.cpp
index 938a553..e49b6bc 100644
--- a/sci/scipack.cpp
+++ b/sci/scipack.cpp
@@ -8,19 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <stdio.h>
diff --git a/sci/sciunpack.cpp b/sci/sciunpack.cpp
index 5b03fa0..f8fbcc0 100644
--- a/sci/sciunpack.cpp
+++ b/sci/sciunpack.cpp
@@ -8,19 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/sci/sciunpack.h b/sci/sciunpack.h
index df605ed..5fac6d4 100644
--- a/sci/sciunpack.h
+++ b/sci/sciunpack.h
@@ -8,19 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SCI_UNPACK_H_
diff --git a/sci/scriptdump.cpp b/sci/scriptdump.cpp
index 9a5ef00..b28841e 100644
--- a/sci/scriptdump.cpp
+++ b/sci/scriptdump.cpp
@@ -8,19 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <console.h>
diff --git a/sci/util.h b/sci/util.h
index 013cb30..ba30c91 100644
--- a/sci/util.h
+++ b/sci/util.h
@@ -8,19 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef UTIL_H
diff --git a/sci/vocabdump.cpp b/sci/vocabdump.cpp
index 26bac4d..eb15073 100644
--- a/sci/vocabdump.cpp
+++ b/sci/vocabdump.cpp
@@ -8,19 +8,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <engine.h>
diff --git a/scummvm-tools-cli.cpp b/scummvm-tools-cli.cpp
index 85dcae7..978b34d 100644
--- a/scummvm-tools-cli.cpp
+++ b/scummvm-tools-cli.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <iostream>
diff --git a/scummvm-tools-cli.h b/scummvm-tools-cli.h
index bf2639f..c7e6fd2 100644
--- a/scummvm-tools-cli.h
+++ b/scummvm-tools-cli.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef CLI_TOOLS_H
diff --git a/sound/adpcm.cpp b/sound/adpcm.cpp
index 7b947d3..0f1a979 100644
--- a/sound/adpcm.cpp
+++ b/sound/adpcm.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "sound/adpcm.h"
diff --git a/sound/adpcm.h b/sound/adpcm.h
index 70097fc..1181e41 100644
--- a/sound/adpcm.h
+++ b/sound/adpcm.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SOUND_ADPCM_H
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp
index f5045a1..f81c3cd 100644
--- a/sound/audiostream.cpp
+++ b/sound/audiostream.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "audiostream.h"
diff --git a/sound/audiostream.h b/sound/audiostream.h
index 9c8d415..0c9f8b7 100644
--- a/sound/audiostream.h
+++ b/sound/audiostream.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SOUND_AUDIOSTREAM_H
diff --git a/sound/voc.cpp b/sound/voc.cpp
index 4e21e66..f190365 100644
--- a/sound/voc.cpp
+++ b/sound/voc.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "voc.h"
diff --git a/sound/voc.h b/sound/voc.h
index 6b7e8fa..cc74400 100644
--- a/sound/voc.h
+++ b/sound/voc.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SOUND_VOC_H
diff --git a/sound/wave.cpp b/sound/wave.cpp
index 72cb269..9e613d1 100644
--- a/sound/wave.cpp
+++ b/sound/wave.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "sound/audiostream.h"
diff --git a/sound/wave.h b/sound/wave.h
index b1dc413..2736435 100644
--- a/sound/wave.h
+++ b/sound/wave.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SOUND_WAVE_H
diff --git a/tool.cpp b/tool.cpp
index ce069f0..14f5575 100644
--- a/tool.cpp
+++ b/tool.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include <stdarg.h>
diff --git a/tool.h b/tool.h
index f796441..4eec06a 100644
--- a/tool.h
+++ b/tool.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TOOL_H
diff --git a/tool_exception.h b/tool_exception.h
index 37f964f..0ef1e77 100644
--- a/tool_exception.h
+++ b/tool_exception.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TOOL_EXCEPTION_H
diff --git a/tools.cpp b/tools.cpp
index 651407e..b95c1a2 100644
--- a/tools.cpp
+++ b/tools.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 
diff --git a/tools.h b/tools.h
index 7517a98..1b91c8e 100644
--- a/tools.h
+++ b/tools.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TOOLS_H
diff --git a/version.cpp b/version.cpp
index d0e7cff..f1d384b 100644
--- a/version.cpp
+++ b/version.cpp
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/scummsys.h"
diff --git a/version.h b/version.h
index 3e36bcd..8a8bbfc 100644
--- a/version.h
+++ b/version.h
@@ -5,19 +5,15 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * 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.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef BASE_VERSION_H


Commit: d1e0358ca3cbbb6ac57d64db7ca2f5da8c96eef1
    https://github.com/scummvm/scummvm-tools/commit/d1e0358ca3cbbb6ac57d64db7ca2f5da8c96eef1
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2014-01-06T14:55:57-08:00

Commit Message:
JANITORIAL: Split copyright notice and descriptive comment

Changed paths:
    engines/cine/decine.cpp
    engines/cine/extract_cine.cpp



diff --git a/engines/cine/decine.cpp b/engines/cine/decine.cpp
index 7423f3c..c695f35 100644
--- a/engines/cine/decine.cpp
+++ b/engines/cine/decine.cpp
@@ -17,7 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ */
+
+/*
  * This is a utility to decode Delphine's Cinematique engine's script files.
  * The script files can be recognized from their extension .prc or .rel.
  * Should at least work with Future Wars and Operation Stealth.
diff --git a/engines/cine/extract_cine.cpp b/engines/cine/extract_cine.cpp
index 0661af3..a6493a9 100644
--- a/engines/cine/extract_cine.cpp
+++ b/engines/cine/extract_cine.cpp
@@ -17,7 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ */
+
+/*
  * This is a utility to unpack Delphine's Cinematique engine's archive files.
  * Should at least work with Future Wars and Operation Stealth.
  * Supports using Operation Stealth's 'vol.cnf' file as input for selecting


Commit: d5c80779331762a3f53124f73db32882d5fb2ea2
    https://github.com/scummvm/scummvm-tools/commit/d5c80779331762a3f53124f73db32882d5fb2ea2
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2014-01-19T10:13:09-08:00

Commit Message:
JANITORIAL: Move copyright notice to a separate file

Changed paths:
  A COPYRIGHT
    common/algorithm.h
    common/array.h
    common/endian.h
    common/file.cpp
    common/file.h
    common/func.h
    common/hash-str.h
    common/hashmap.cpp
    common/hashmap.h
    common/md5.cpp
    common/md5.h
    common/memorypool.cpp
    common/memorypool.h
    common/noncopyable.h
    common/pack-end.h
    common/pack-start.h
    common/scummsys.h
    common/str.cpp
    common/str.h
    common/util.cpp
    common/util.h
    compress.cpp
    compress.h
    create_sjisfnt.cpp
    create_sjisfnt.h
    decompiler/codegen.cpp
    decompiler/codegen.h
    decompiler/control_flow.cpp
    decompiler/control_flow.h
    decompiler/decompiler.cpp
    decompiler/disassembler.cpp
    decompiler/disassembler.h
    decompiler/engine.h
    decompiler/graph.cpp
    decompiler/graph.h
    decompiler/groovie/disassembler.cpp
    decompiler/groovie/disassembler.h
    decompiler/groovie/engine.cpp
    decompiler/groovie/engine.h
    decompiler/groovie/opcodes.h
    decompiler/instruction.cpp
    decompiler/instruction.h
    decompiler/kyra/codegen.cpp
    decompiler/kyra/codegen.h
    decompiler/kyra/disassembler.cpp
    decompiler/kyra/disassembler.h
    decompiler/kyra/engine.cpp
    decompiler/kyra/engine.h
    decompiler/objectFactory.h
    decompiler/refcounted.h
    decompiler/scummv6/codegen.cpp
    decompiler/scummv6/codegen.h
    decompiler/scummv6/disassembler.cpp
    decompiler/scummv6/disassembler.h
    decompiler/scummv6/engine.cpp
    decompiler/scummv6/engine.h
    decompiler/simple_disassembler.cpp
    decompiler/simple_disassembler.h
    decompiler/stack.h
    decompiler/test/cfg_test.h
    decompiler/test/codegen.h
    decompiler/test/disassembler/pasc.cpp
    decompiler/test/disassembler/pasc.h
    decompiler/test/disassembler/subopcode.cpp
    decompiler/test/disassembler/subopcode.h
    decompiler/test/disassembler_test.h
    decompiler/unknown_opcode.cpp
    decompiler/unknown_opcode.h
    decompiler/value.cpp
    decompiler/value.h
    decompiler/wrongtype.h
    encode_dxa.cpp
    encode_dxa.h
    engines/agos/compress_agos.cpp
    engines/agos/compress_agos.h
    engines/agos/extract_agos.cpp
    engines/agos/extract_agos.h
    engines/cge/cge_structs.h
    engines/cge/extract_cge.cpp
    engines/cge/extract_cge.h
    engines/cge/pack_cge.cpp
    engines/cge/pack_cge.h
    engines/cine/decine.cpp
    engines/cine/extract_cine.cpp
    engines/cine/extract_cine.h
    engines/cruise/extract_cruise_pc.cpp
    engines/cruise/extract_cruise_pc.h
    engines/gob/compress_gob.cpp
    engines/gob/compress_gob.h
    engines/gob/degob.cpp
    engines/gob/degob_script.cpp
    engines/gob/degob_script.h
    engines/gob/degob_script_bargon.cpp
    engines/gob/degob_script_fascin.cpp
    engines/gob/degob_script_geisha.cpp
    engines/gob/degob_script_littlered.cpp
    engines/gob/degob_script_v1.cpp
    engines/gob/degob_script_v2.cpp
    engines/gob/degob_script_v3.cpp
    engines/gob/degob_script_v4.cpp
    engines/gob/degob_script_v5.cpp
    engines/gob/degob_script_v6.cpp
    engines/gob/extract_fascination_cd.cpp
    engines/gob/extract_fascination_cd.h
    engines/gob/extract_gob_stk.cpp
    engines/gob/extract_gob_stk.h
    engines/gob/gob_loadcalc.cpp
    engines/kyra/compress_kyra.cpp
    engines/kyra/compress_kyra.h
    engines/kyra/dekyra.cpp
    engines/kyra/dekyra.h
    engines/kyra/dekyra_v1.cpp
    engines/kyra/extract_kyra.cpp
    engines/kyra/extract_kyra.h
    engines/kyra/kyra_ins.cpp
    engines/kyra/kyra_ins.h
    engines/kyra/kyra_pak.cpp
    engines/kyra/kyra_pak.h
    engines/mohawk/archive.cpp
    engines/mohawk/archive.h
    engines/mohawk/construct_mohawk.cpp
    engines/mohawk/deriven.cpp
    engines/mohawk/extract_mohawk.cpp
    engines/parallaction/extract_parallaction.cpp
    engines/parallaction/extract_parallaction.h
    engines/pegasus/pegasus_save_types.cpp
    engines/queen/compress_queen.cpp
    engines/queen/compress_queen.h
    engines/saga/compress_saga.cpp
    engines/saga/compress_saga.h
    engines/sci/compress_sci.cpp
    engines/sci/compress_sci.h
    engines/scumm/compress_scumm_bun.cpp
    engines/scumm/compress_scumm_bun.h
    engines/scumm/compress_scumm_san.cpp
    engines/scumm/compress_scumm_san.h
    engines/scumm/compress_scumm_sou.cpp
    engines/scumm/compress_scumm_sou.h
    engines/scumm/descumm-common.cpp
    engines/scumm/descumm-tool.cpp
    engines/scumm/descumm.cpp
    engines/scumm/descumm.h
    engines/scumm/descumm6.cpp
    engines/scumm/extract_loom_tg16.cpp
    engines/scumm/extract_loom_tg16.h
    engines/scumm/extract_mm_apple.cpp
    engines/scumm/extract_mm_apple.h
    engines/scumm/extract_mm_c64.cpp
    engines/scumm/extract_mm_c64.h
    engines/scumm/extract_mm_nes.cpp
    engines/scumm/extract_mm_nes.h
    engines/scumm/extract_scumm_mac.cpp
    engines/scumm/extract_scumm_mac.h
    engines/scumm/extract_zak_c64.cpp
    engines/scumm/extract_zak_c64.h
    engines/sword1/compress_sword1.cpp
    engines/sword1/compress_sword1.h
    engines/sword2/compress_sword2.cpp
    engines/sword2/compress_sword2.h
    engines/sword2/desword2.cpp
    engines/sword2/sword2_clue.cpp
    engines/tinsel/compress_tinsel.cpp
    engines/tinsel/compress_tinsel.h
    engines/touche/compress_touche.cpp
    engines/touche/compress_touche.h
    engines/tucker/compress_tucker.cpp
    engines/tucker/compress_tucker.h
    example_tool.cpp
    gui/configuration.cpp
    gui/configuration.h
    gui/gui_tools.cpp
    gui/gui_tools.h
    gui/main.cpp
    gui/main.h
    gui/pages.cpp
    gui/pages.h
    main_cli.cpp
    sci/classes.cpp
    sci/graphics_png.h
    sci/listwords.cpp
    sci/musicplayer.cpp
    sci/old_objects.cpp
    sci/old_objects.h
    sci/scidisasm.cpp
    sci/scipack.cpp
    sci/sciunpack.cpp
    sci/sciunpack.h
    sci/scriptdump.cpp
    sci/util.h
    sci/vocabdump.cpp
    scummvm-tools-cli.cpp
    scummvm-tools-cli.h
    sound/adpcm.cpp
    sound/adpcm.h
    sound/audiostream.cpp
    sound/audiostream.h
    sound/voc.cpp
    sound/voc.h
    sound/wave.cpp
    sound/wave.h
    tool.cpp
    tool.h
    tool_exception.h
    tools.cpp
    tools.h
    version.cpp
    version.h



diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..6bcf7dd
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,57 @@
+ScummVM Tools
+Copyright (C) 2001-2014 by the following:
+
+If you have contributed to this project then you deserve to be on this
+list.  Contact us and we'll add you.
+
+Torbjorn Andersson
+Ori Avtalion
+Fabio Battaglia
+James Brown
+Arnaud Boutonne
+Henry Bush
+Thierry Crozat
+Adam Forsyth
+Benjamin Haisch
+Marcoen Hirschberg
+Max Horn
+Matthew Hoops
+Travis Howell
+Casey Hutchinson
+Florian Kagerer
+Filippos Karapetis
+Martin Kiewitz
+Pawel Kolodziejski
+Paul Gilbert
+Sven Hesse
+Michael Madsen
+Alyssa Milburn
+Gregory Montoir
+Willem Jan Palenstijn
+Joost Peters
+Eugene Sandulenko
+Johannes Schickel
+Ludvig Strigeus
+Julien Templier
+David Turner
+Jordi Vilalta Prat
+peres
+
+Patches contributed by:
+
+agf
+Alban Bedel
+Yak Bizzarro
+Laurent Blume
+Ben "irrelevant"
+canavan
+Florob
+Nicolas Joly
+KeithS
+Norbert Lange
+Langa Lucian
+LunaVorax
+Sean Murray
+remere
+Quietust
+Andrea Suatoni
diff --git a/common/algorithm.h b/common/algorithm.h
index 405ad88..b4ce67a 100644
--- a/common/algorithm.h
+++ b/common/algorithm.h
@@ -1,8 +1,13 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/array.h b/common/array.h
index 244b385..6a574d2 100644
--- a/common/array.h
+++ b/common/array.h
@@ -1,8 +1,13 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/endian.h b/common/endian.h
index 801f1d5..a7c0e0b 100644
--- a/common/endian.h
+++ b/common/endian.h
@@ -1,5 +1,13 @@
 /* ScummVM Tools
- * Copyright (C) 2002-2009 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/file.cpp b/common/file.cpp
index 441bca9..051ccff 100644
--- a/common/file.cpp
+++ b/common/file.cpp
@@ -1,5 +1,13 @@
 /* ScummVM Tools
- * Copyright (C) 2002-2009 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/file.h b/common/file.h
index 470c9b3..956b8f7 100644
--- a/common/file.h
+++ b/common/file.h
@@ -1,5 +1,13 @@
 /* ScummVM Tools
- * Copyright (C) 2002-2009 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/func.h b/common/func.h
index e09ab1a..4d7c48f 100644
--- a/common/func.h
+++ b/common/func.h
@@ -1,8 +1,13 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/hash-str.h b/common/hash-str.h
index 1b8a578..7fce73b 100644
--- a/common/hash-str.h
+++ b/common/hash-str.h
@@ -1,8 +1,13 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/hashmap.cpp b/common/hashmap.cpp
index 088508f..7fd2bb3 100644
--- a/common/hashmap.cpp
+++ b/common/hashmap.cpp
@@ -1,8 +1,13 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/hashmap.h b/common/hashmap.h
index 1dcfa81..e749628 100644
--- a/common/hashmap.h
+++ b/common/hashmap.h
@@ -1,8 +1,13 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/md5.cpp b/common/md5.cpp
index de541bd..40f174f 100644
--- a/common/md5.cpp
+++ b/common/md5.cpp
@@ -1,5 +1,13 @@
 /* ScummVM Tools
- * Copyright (C) 2002-2009 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/md5.h b/common/md5.h
index a782a48..a78b7b8 100644
--- a/common/md5.h
+++ b/common/md5.h
@@ -1,5 +1,13 @@
 /* ScummVM Tools
- * Copyright (C) 2002-2009 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/memorypool.cpp b/common/memorypool.cpp
index f961f4f..bcce70c 100644
--- a/common/memorypool.cpp
+++ b/common/memorypool.cpp
@@ -1,8 +1,13 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/memorypool.h b/common/memorypool.h
index cc360eb..18266c6 100644
--- a/common/memorypool.h
+++ b/common/memorypool.h
@@ -1,8 +1,13 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/noncopyable.h b/common/noncopyable.h
index db552c0..d28f8ed 100644
--- a/common/noncopyable.h
+++ b/common/noncopyable.h
@@ -1,8 +1,13 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/pack-end.h b/common/pack-end.h
index ada0f8d..bbee291 100644
--- a/common/pack-end.h
+++ b/common/pack-end.h
@@ -1,5 +1,13 @@
 /* ScummVM Tools
- * Copyright (C) 2002-2009 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/pack-start.h b/common/pack-start.h
index 85049b4..433316c 100644
--- a/common/pack-start.h
+++ b/common/pack-start.h
@@ -1,5 +1,13 @@
 /* ScummVM Tools
- * Copyright (C) 2002-2009 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/scummsys.h b/common/scummsys.h
index 2067760..09524e4 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -1,5 +1,13 @@
 /* ScummVM Tools
- * Copyright (C) 2002-2009 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/str.cpp b/common/str.cpp
index c9bd024..d842ba7 100644
--- a/common/str.cpp
+++ b/common/str.cpp
@@ -1,8 +1,13 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/str.h b/common/str.h
index bb7fd21..e517bcb 100644
--- a/common/str.h
+++ b/common/str.h
@@ -1,8 +1,13 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/util.cpp b/common/util.cpp
index b5289c2..b9c59dd 100644
--- a/common/util.cpp
+++ b/common/util.cpp
@@ -1,5 +1,13 @@
 /* ScummVM Tools
- * Copyright (C) 2002-2009 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/common/util.h b/common/util.h
index dd5b26a..987c21b 100644
--- a/common/util.h
+++ b/common/util.h
@@ -1,5 +1,13 @@
 /* ScummVM Tools
- * Copyright (C) 2002-2009 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * Additionally this file is based on the ScummVM source code.
+ * Copyright information for the ScummVM source code is
+ * available in the COPYRIGHT file of the ScummVM source
+ * distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/compress.cpp b/compress.cpp
index 76d9790..71eee40 100644
--- a/compress.cpp
+++ b/compress.cpp
@@ -1,5 +1,8 @@
-/* Scumm Tools
- * Copyright (C) 2003-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/compress.h b/compress.h
index ac9ba5c..f163404 100644
--- a/compress.h
+++ b/compress.h
@@ -1,5 +1,8 @@
-/* Scumm Tools
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/create_sjisfnt.cpp b/create_sjisfnt.cpp
index 27c1d37..bd31acc 100644
--- a/create_sjisfnt.cpp
+++ b/create_sjisfnt.cpp
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/create_sjisfnt.h b/create_sjisfnt.h
index 6fa2390..59f782a 100644
--- a/create_sjisfnt.h
+++ b/create_sjisfnt.h
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/codegen.cpp b/decompiler/codegen.cpp
index 04e0855..d19d167 100644
--- a/decompiler/codegen.cpp
+++ b/decompiler/codegen.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/codegen.h b/decompiler/codegen.h
index 1f2a0f9..440acda 100644
--- a/decompiler/codegen.h
+++ b/decompiler/codegen.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/control_flow.cpp b/decompiler/control_flow.cpp
index a3eaae0..f3ae71b 100644
--- a/decompiler/control_flow.cpp
+++ b/decompiler/control_flow.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/control_flow.h b/decompiler/control_flow.h
index 263c0cf..15dcdd8 100644
--- a/decompiler/control_flow.h
+++ b/decompiler/control_flow.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/decompiler.cpp b/decompiler/decompiler.cpp
index dfa22f9..fdaf99a 100644
--- a/decompiler/decompiler.cpp
+++ b/decompiler/decompiler.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/disassembler.cpp b/decompiler/disassembler.cpp
index fde928b..5c5673b 100644
--- a/decompiler/disassembler.cpp
+++ b/decompiler/disassembler.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/disassembler.h b/decompiler/disassembler.h
index da3ef34..9c63332 100644
--- a/decompiler/disassembler.h
+++ b/decompiler/disassembler.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/engine.h b/decompiler/engine.h
index 57c0e8c..e4fe045 100644
--- a/decompiler/engine.h
+++ b/decompiler/engine.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/graph.cpp b/decompiler/graph.cpp
index 80443e3..7f3c135 100644
--- a/decompiler/graph.cpp
+++ b/decompiler/graph.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/graph.h b/decompiler/graph.h
index 9e3c4ff..7c8e3f1 100644
--- a/decompiler/graph.h
+++ b/decompiler/graph.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/groovie/disassembler.cpp b/decompiler/groovie/disassembler.cpp
index 91c8a1f..7a483ca 100644
--- a/decompiler/groovie/disassembler.cpp
+++ b/decompiler/groovie/disassembler.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/groovie/disassembler.h b/decompiler/groovie/disassembler.h
index 27a0f38..c24911e 100644
--- a/decompiler/groovie/disassembler.h
+++ b/decompiler/groovie/disassembler.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/groovie/engine.cpp b/decompiler/groovie/engine.cpp
index 2e94a5a..052c7e5 100644
--- a/decompiler/groovie/engine.cpp
+++ b/decompiler/groovie/engine.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/groovie/engine.h b/decompiler/groovie/engine.h
index f493b50..ddf0ae4 100644
--- a/decompiler/groovie/engine.h
+++ b/decompiler/groovie/engine.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/groovie/opcodes.h b/decompiler/groovie/opcodes.h
index 9cda060..40ca5e5 100644
--- a/decompiler/groovie/opcodes.h
+++ b/decompiler/groovie/opcodes.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/instruction.cpp b/decompiler/instruction.cpp
index 458fc0c..ee8e86b 100644
--- a/decompiler/instruction.cpp
+++ b/decompiler/instruction.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/instruction.h b/decompiler/instruction.h
index 46a7652..3e98d55 100644
--- a/decompiler/instruction.h
+++ b/decompiler/instruction.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/kyra/codegen.cpp b/decompiler/kyra/codegen.cpp
index 82d62c7..6ab5da4 100644
--- a/decompiler/kyra/codegen.cpp
+++ b/decompiler/kyra/codegen.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/kyra/codegen.h b/decompiler/kyra/codegen.h
index 51dc58e..67aede1 100644
--- a/decompiler/kyra/codegen.h
+++ b/decompiler/kyra/codegen.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/kyra/disassembler.cpp b/decompiler/kyra/disassembler.cpp
index 6f6e759..83bd194 100644
--- a/decompiler/kyra/disassembler.cpp
+++ b/decompiler/kyra/disassembler.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/kyra/disassembler.h b/decompiler/kyra/disassembler.h
index b9e0df0..32b0b98 100644
--- a/decompiler/kyra/disassembler.h
+++ b/decompiler/kyra/disassembler.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/kyra/engine.cpp b/decompiler/kyra/engine.cpp
index e7d8d21..ed39253 100644
--- a/decompiler/kyra/engine.cpp
+++ b/decompiler/kyra/engine.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/kyra/engine.h b/decompiler/kyra/engine.h
index 660456a..d890cf2 100644
--- a/decompiler/kyra/engine.h
+++ b/decompiler/kyra/engine.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/objectFactory.h b/decompiler/objectFactory.h
index fcd86d0..9a2a964 100644
--- a/decompiler/objectFactory.h
+++ b/decompiler/objectFactory.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/refcounted.h b/decompiler/refcounted.h
index b93e3bb..2152192 100644
--- a/decompiler/refcounted.h
+++ b/decompiler/refcounted.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/scummv6/codegen.cpp b/decompiler/scummv6/codegen.cpp
index f8fc84c..404d9cd 100644
--- a/decompiler/scummv6/codegen.cpp
+++ b/decompiler/scummv6/codegen.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/scummv6/codegen.h b/decompiler/scummv6/codegen.h
index fdb9f29..4cf1b6f 100644
--- a/decompiler/scummv6/codegen.h
+++ b/decompiler/scummv6/codegen.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/scummv6/disassembler.cpp b/decompiler/scummv6/disassembler.cpp
index 22c9f47..7917cc0 100644
--- a/decompiler/scummv6/disassembler.cpp
+++ b/decompiler/scummv6/disassembler.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/scummv6/disassembler.h b/decompiler/scummv6/disassembler.h
index 1d48d86..ab260f8 100644
--- a/decompiler/scummv6/disassembler.h
+++ b/decompiler/scummv6/disassembler.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/scummv6/engine.cpp b/decompiler/scummv6/engine.cpp
index 57b086f..563e259 100644
--- a/decompiler/scummv6/engine.cpp
+++ b/decompiler/scummv6/engine.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/scummv6/engine.h b/decompiler/scummv6/engine.h
index 28a60aa..60b8aed 100644
--- a/decompiler/scummv6/engine.h
+++ b/decompiler/scummv6/engine.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/simple_disassembler.cpp b/decompiler/simple_disassembler.cpp
index cb0d67d..fd2f2fe 100644
--- a/decompiler/simple_disassembler.cpp
+++ b/decompiler/simple_disassembler.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/simple_disassembler.h b/decompiler/simple_disassembler.h
index 0603736..ebfdb8e 100644
--- a/decompiler/simple_disassembler.h
+++ b/decompiler/simple_disassembler.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/stack.h b/decompiler/stack.h
index a94f35e..2bda837 100644
--- a/decompiler/stack.h
+++ b/decompiler/stack.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/test/cfg_test.h b/decompiler/test/cfg_test.h
index 9298a7a..84f4f1e 100644
--- a/decompiler/test/cfg_test.h
+++ b/decompiler/test/cfg_test.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/test/codegen.h b/decompiler/test/codegen.h
index 1049d19..c28aff8 100644
--- a/decompiler/test/codegen.h
+++ b/decompiler/test/codegen.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/test/disassembler/pasc.cpp b/decompiler/test/disassembler/pasc.cpp
index e6f757e..df38c8b 100644
--- a/decompiler/test/disassembler/pasc.cpp
+++ b/decompiler/test/disassembler/pasc.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/test/disassembler/pasc.h b/decompiler/test/disassembler/pasc.h
index 87bf5ec..d096ed9 100644
--- a/decompiler/test/disassembler/pasc.h
+++ b/decompiler/test/disassembler/pasc.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/test/disassembler/subopcode.cpp b/decompiler/test/disassembler/subopcode.cpp
index bf5ad71..13df075 100644
--- a/decompiler/test/disassembler/subopcode.cpp
+++ b/decompiler/test/disassembler/subopcode.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/test/disassembler/subopcode.h b/decompiler/test/disassembler/subopcode.h
index 9a6c266..9258741 100644
--- a/decompiler/test/disassembler/subopcode.h
+++ b/decompiler/test/disassembler/subopcode.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/test/disassembler_test.h b/decompiler/test/disassembler_test.h
index 8d21e80..76ad03f 100644
--- a/decompiler/test/disassembler_test.h
+++ b/decompiler/test/disassembler_test.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/unknown_opcode.cpp b/decompiler/unknown_opcode.cpp
index 4c61adf..67f82b0 100644
--- a/decompiler/unknown_opcode.cpp
+++ b/decompiler/unknown_opcode.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/unknown_opcode.h b/decompiler/unknown_opcode.h
index 77e7b2a..d06bc73 100644
--- a/decompiler/unknown_opcode.h
+++ b/decompiler/unknown_opcode.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/value.cpp b/decompiler/value.cpp
index cdef84c..4ae0219 100644
--- a/decompiler/value.cpp
+++ b/decompiler/value.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/value.h b/decompiler/value.h
index a70fcbf..4f26fe9 100644
--- a/decompiler/value.h
+++ b/decompiler/value.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/decompiler/wrongtype.h b/decompiler/wrongtype.h
index 59863ac..0665f9f 100644
--- a/decompiler/wrongtype.h
+++ b/decompiler/wrongtype.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2010 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/encode_dxa.cpp b/encode_dxa.cpp
index c9843b2..c38c9bb 100644
--- a/encode_dxa.cpp
+++ b/encode_dxa.cpp
@@ -1,6 +1,8 @@
-/* encode_dxa - compressor for dxa files
- * Copyright (c) 2006 The ScummVM Team
- * Copyright (c) 2006 Benjamin Haisch
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/encode_dxa.h b/encode_dxa.h
index 87f9b15..059379a 100644
--- a/encode_dxa.h
+++ b/encode_dxa.h
@@ -1,5 +1,8 @@
-/* encode_dxa - compressor for dxa files
- * Copyright (c) 2009 The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/engines/agos/compress_agos.cpp b/engines/agos/compress_agos.cpp
index e9bdecc..595b7bb 100644
--- a/engines/agos/compress_agos.cpp
+++ b/engines/agos/compress_agos.cpp
@@ -1,5 +1,8 @@
-/* compress_agos - Compress Simon the Sorcerer 1/2 digital sound files into MP3-format
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Compress Simon the Sorcerer 1/2 digital sound files into MP3-format */
+
 #include <string.h>
 #include <stdio.h>
 
diff --git a/engines/agos/compress_agos.h b/engines/agos/compress_agos.h
index 4f6e8bb..61a1776 100644
--- a/engines/agos/compress_agos.h
+++ b/engines/agos/compress_agos.h
@@ -1,5 +1,8 @@
-/* compress_agos.h - Compress Simon the Sorcerer 1/2 digital sound files into compressed audio format
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Compress Simon the Sorcerer 1/2 digital sound files into compressed audio format */
+
 #ifndef COMPRESS_AGOS_H
 #define COMPRESS_AGOS_H
 
diff --git a/engines/agos/extract_agos.cpp b/engines/agos/extract_agos.cpp
index c9812b6..50768bd 100644
--- a/engines/agos/extract_agos.cpp
+++ b/engines/agos/extract_agos.cpp
@@ -1,5 +1,8 @@
-/* extract_agos - Extracts the packed files used in the Amiga and AtariST versions
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extracts the packed files used in the Amiga and AtariST versions */
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/engines/agos/extract_agos.h b/engines/agos/extract_agos.h
index 80034cb..1f89a24 100644
--- a/engines/agos/extract_agos.h
+++ b/engines/agos/extract_agos.h
@@ -1,5 +1,8 @@
-/* extract_gob_stk.h - Extracts the packed files used in the Amiga and AtariST versions
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extracts the packed files used in the Amiga and AtariST versions */
+
 #ifndef EXTRACT_AGOS_H
 #define EXTRACT_AGOS_H
 
diff --git a/engines/cge/cge_structs.h b/engines/cge/cge_structs.h
index da4585b..0fe9431 100644
--- a/engines/cge/cge_structs.h
+++ b/engines/cge/cge_structs.h
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/engines/cge/extract_cge.cpp b/engines/cge/extract_cge.cpp
index 2afd030..3593e84 100644
--- a/engines/cge/extract_cge.cpp
+++ b/engines/cge/extract_cge.cpp
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/engines/cge/extract_cge.h b/engines/cge/extract_cge.h
index 212fa26..4c4bc5c 100644
--- a/engines/cge/extract_cge.h
+++ b/engines/cge/extract_cge.h
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/engines/cge/pack_cge.cpp b/engines/cge/pack_cge.cpp
index 44cb3f0..240ac54 100644
--- a/engines/cge/pack_cge.cpp
+++ b/engines/cge/pack_cge.cpp
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/engines/cge/pack_cge.h b/engines/cge/pack_cge.h
index a5ac3ac..6124959 100644
--- a/engines/cge/pack_cge.h
+++ b/engines/cge/pack_cge.h
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/engines/cine/decine.cpp b/engines/cine/decine.cpp
index c695f35..5a00d67 100644
--- a/engines/cine/decine.cpp
+++ b/engines/cine/decine.cpp
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/engines/cine/extract_cine.cpp b/engines/cine/extract_cine.cpp
index a6493a9..179505e 100644
--- a/engines/cine/extract_cine.cpp
+++ b/engines/cine/extract_cine.cpp
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/engines/cine/extract_cine.h b/engines/cine/extract_cine.h
index da102a6..0fc19a1 100644
--- a/engines/cine/extract_cine.h
+++ b/engines/cine/extract_cine.h
@@ -1,5 +1,8 @@
-/* Scumm Tools
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/engines/cruise/extract_cruise_pc.cpp b/engines/cruise/extract_cruise_pc.cpp
index 9493b89..4e0ac6a 100644
--- a/engines/cruise/extract_cruise_pc.cpp
+++ b/engines/cruise/extract_cruise_pc.cpp
@@ -1,5 +1,8 @@
-/* extract_cruise_pc - Extract data from PC version of Cruise for a Corpse
- * Copyright (C) 2009  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extract data from PC version of Cruise for a Corpse */
+
 #include <stdarg.h>
 #include <string.h>
 
diff --git a/engines/cruise/extract_cruise_pc.h b/engines/cruise/extract_cruise_pc.h
index de7c4e2..d63d78e 100644
--- a/engines/cruise/extract_cruise_pc.h
+++ b/engines/cruise/extract_cruise_pc.h
@@ -1,5 +1,8 @@
-/* extract_cruise_pc - Extract data from PC version of Cruise for a Corpse
- * Copyright (C) 2009  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extract data from PC version of Cruise for a Corpse */
+
 #ifndef EXTRACT_CRUISE_PC_H
 #define EXTRACT_CRUISE_PC_H
 
diff --git a/engines/gob/compress_gob.cpp b/engines/gob/compress_gob.cpp
index f9229cb..e52670e 100644
--- a/engines/gob/compress_gob.cpp
+++ b/engines/gob/compress_gob.cpp
@@ -1,5 +1,8 @@
-/* compress_gob - .stk/.itk archive creation tool, based on a conf file.
- * Copyright (C) 2007 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* .stk/.itk archive creation tool, based on a conf file */
+
 #include <string.h>
 
 #include "compress_gob.h"
diff --git a/engines/gob/compress_gob.h b/engines/gob/compress_gob.h
index c5d1d06..820b7a4 100644
--- a/engines/gob/compress_gob.h
+++ b/engines/gob/compress_gob.h
@@ -1,5 +1,8 @@
-/* Scumm Tools
- * Copyright (C) 2007 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/engines/gob/degob.cpp b/engines/gob/degob.cpp
index c5aa327..b106dd5 100644
--- a/engines/gob/degob.cpp
+++ b/engines/gob/degob.cpp
@@ -1,5 +1,8 @@
-/* DeGob - GobEngine Script disassembler
- * Copyright (C) 2008 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* GobEngine Script disassembler */
+
 #include <string.h>
 #include <stdio.h>
 
diff --git a/engines/gob/degob_script.cpp b/engines/gob/degob_script.cpp
index 6c5ea9f..197cf1c 100644
--- a/engines/gob/degob_script.cpp
+++ b/engines/gob/degob_script.cpp
@@ -1,5 +1,8 @@
-/* DeGob - GobEngine Script disassembler
- * Copyright (C) 2008 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* GobEngine Script disassembler */
+
 #include <assert.h>
 #include <stdarg.h>
 #include <string.h>
diff --git a/engines/gob/degob_script.h b/engines/gob/degob_script.h
index aeb2b69..88ad4a6 100644
--- a/engines/gob/degob_script.h
+++ b/engines/gob/degob_script.h
@@ -1,5 +1,8 @@
-/* DeGob - GobEngine Script disassembler
- * Copyright (C) 2008 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* GobEngine Script disassembler */
+
 #ifndef DEGOB_SCRIPT_H
 #define DEGOB_SCRIPT_H
 
diff --git a/engines/gob/degob_script_bargon.cpp b/engines/gob/degob_script_bargon.cpp
index c50061d..e3b9675 100644
--- a/engines/gob/degob_script_bargon.cpp
+++ b/engines/gob/degob_script_bargon.cpp
@@ -1,5 +1,8 @@
-/* DeGob - GobEngine Script disassembler
- * Copyright (C) 2008 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* GobEngine Script disassembler */
+
 #include "degob_script.h"
 #include "common/util.h"
 
diff --git a/engines/gob/degob_script_fascin.cpp b/engines/gob/degob_script_fascin.cpp
index e3db4f0..543c717 100644
--- a/engines/gob/degob_script_fascin.cpp
+++ b/engines/gob/degob_script_fascin.cpp
@@ -1,5 +1,8 @@
-/* DeGob - GobEngine Script disassembler
- * Copyright (C) 2008 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* GobEngine Script disassembler */
+
 #include "degob_script.h"
 #include "common/util.h"
 
diff --git a/engines/gob/degob_script_geisha.cpp b/engines/gob/degob_script_geisha.cpp
index 38d073c..3e1aeee 100644
--- a/engines/gob/degob_script_geisha.cpp
+++ b/engines/gob/degob_script_geisha.cpp
@@ -1,5 +1,8 @@
-/* DeGob - GobEngine Script disassembler
- * Copyright (C) 2008 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* GobEngine Script disassembler */
+
 #include "degob_script.h"
 #include "common/endian.h"
 #include "common/util.h"
diff --git a/engines/gob/degob_script_littlered.cpp b/engines/gob/degob_script_littlered.cpp
index 920c988..8d8b837 100644
--- a/engines/gob/degob_script_littlered.cpp
+++ b/engines/gob/degob_script_littlered.cpp
@@ -1,5 +1,8 @@
-/* DeGob - GobEngine Script disassembler
- * Copyright (C) 2008 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* GobEngine Script disassembler */
+
 #include "degob_script.h"
 #include "common/util.h"
 
diff --git a/engines/gob/degob_script_v1.cpp b/engines/gob/degob_script_v1.cpp
index 71c1800..3b2d358 100644
--- a/engines/gob/degob_script_v1.cpp
+++ b/engines/gob/degob_script_v1.cpp
@@ -1,5 +1,8 @@
-/* DeGob - GobEngine Script disassembler
- * Copyright (C) 2008 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* GobEngine Script disassembler */
+
 #include "degob_script.h"
 #include "common/endian.h"
 #include "common/util.h"
diff --git a/engines/gob/degob_script_v2.cpp b/engines/gob/degob_script_v2.cpp
index ec560a7..6a7c8bf 100644
--- a/engines/gob/degob_script_v2.cpp
+++ b/engines/gob/degob_script_v2.cpp
@@ -1,5 +1,8 @@
-/* DeGob - GobEngine Script disassembler
- * Copyright (C) 2008 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* GobEngine Script disassembler */
+
 #include "degob_script.h"
 #include "common/endian.h"
 #include "common/util.h"
diff --git a/engines/gob/degob_script_v3.cpp b/engines/gob/degob_script_v3.cpp
index a66e1ac..cdf22da 100644
--- a/engines/gob/degob_script_v3.cpp
+++ b/engines/gob/degob_script_v3.cpp
@@ -1,5 +1,8 @@
-/* DeGob - GobEngine Script disassembler
- * Copyright (C) 2008 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* GobEngine Script disassembler */
+
 #include "degob_script.h"
 #include "common/util.h"
 
diff --git a/engines/gob/degob_script_v4.cpp b/engines/gob/degob_script_v4.cpp
index 6d73083..d8b195d 100644
--- a/engines/gob/degob_script_v4.cpp
+++ b/engines/gob/degob_script_v4.cpp
@@ -1,5 +1,8 @@
-/* DeGob - GobEngine Script disassembler
- * Copyright (C) 2008 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* GobEngine Script disassembler */
+
 #include "degob_script.h"
 #include "common/util.h"
 
diff --git a/engines/gob/degob_script_v5.cpp b/engines/gob/degob_script_v5.cpp
index 4efecab..8441cd6 100644
--- a/engines/gob/degob_script_v5.cpp
+++ b/engines/gob/degob_script_v5.cpp
@@ -1,5 +1,8 @@
-/* DeGob - GobEngine Script disassembler
- * Copyright (C) 2008 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* GobEngine Script disassembler */
+
 #include "degob_script.h"
 #include "common/util.h"
 
diff --git a/engines/gob/degob_script_v6.cpp b/engines/gob/degob_script_v6.cpp
index 07885b6..b5454c1 100644
--- a/engines/gob/degob_script_v6.cpp
+++ b/engines/gob/degob_script_v6.cpp
@@ -1,5 +1,8 @@
-/* DeGob - GobEngine Script disassembler
- * Copyright (C) 2008 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* GobEngine Script disassembler */
+
 #include "degob_script.h"
 #include "common/util.h"
 
diff --git a/engines/gob/extract_fascination_cd.cpp b/engines/gob/extract_fascination_cd.cpp
index 9801436..f02643b 100644
--- a/engines/gob/extract_fascination_cd.cpp
+++ b/engines/gob/extract_fascination_cd.cpp
@@ -1,5 +1,8 @@
-/* extract_fascination_cd - a tool for extracting .stk archives from a mode1/2048 Fascination CD image
- * Copyright (C) 2010  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* a tool for extracting .stk archives from a mode1/2048 Fascination CD image */
+
 #include "common/endian.h"
 #include "common/file.h"
 #include "common/util.h"
diff --git a/engines/gob/extract_fascination_cd.h b/engines/gob/extract_fascination_cd.h
index 933b2b4..0c26a29 100644
--- a/engines/gob/extract_fascination_cd.h
+++ b/engines/gob/extract_fascination_cd.h
@@ -1,5 +1,8 @@
-/* extract_fascination_cd - a tool for extracting .stk archives from a mode1/2048 Fascination CD image
- * Copyright (C) 2010  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* a tool for extracting .stk archives from a mode1/2048 Fascination CD image */
+
 #ifndef EXTRACT_FASCINATION_CD_H
 #define EXTRACT_FASCINATION_CD_H
 
diff --git a/engines/gob/extract_gob_stk.cpp b/engines/gob/extract_gob_stk.cpp
index e7d43d0..478f0ce 100644
--- a/engines/gob/extract_gob_stk.cpp
+++ b/engines/gob/extract_gob_stk.cpp
@@ -1,5 +1,8 @@
-/* extract_gob_stk - Extractor for Coktel Vision game's .stk/.itk archives
- * Copyright (C) 2007 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extractor for Coktel Vision game's .stk/.itk archives */
+
 #include <string.h>
 #include <stdio.h>
 
diff --git a/engines/gob/extract_gob_stk.h b/engines/gob/extract_gob_stk.h
index 693ea8d..c8b2df5 100644
--- a/engines/gob/extract_gob_stk.h
+++ b/engines/gob/extract_gob_stk.h
@@ -1,5 +1,8 @@
-/* extract_gob_stk.h - Extractor for Coktel Vision game's .stk/.itk archives
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extractor for Coktel Vision game's .stk/.itk archives */
+
 #ifndef EXTRACT_GOB_STK_H
 #define EXTRACT_GOB_STK_H
 
diff --git a/engines/gob/gob_loadcalc.cpp b/engines/gob/gob_loadcalc.cpp
index 993473a..00a818a 100644
--- a/engines/gob/gob_loadcalc.cpp
+++ b/engines/gob/gob_loadcalc.cpp
@@ -1,5 +1,8 @@
-/* gob_loadcalc - Gobliiins (Gob1) Load Code Calculator
- * Copyright (C) 2010 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Gobliiins (Gob1) Load Code Calculator */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdlib.h>
diff --git a/engines/kyra/compress_kyra.cpp b/engines/kyra/compress_kyra.cpp
index 9269d16..b7fec32 100644
--- a/engines/kyra/compress_kyra.cpp
+++ b/engines/kyra/compress_kyra.cpp
@@ -1,5 +1,8 @@
-/* compress_kyra_bun - compressor for kyra sound file packages
- * Copyright (C) 2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* compressor for kyra sound file packages */
+
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/engines/kyra/compress_kyra.h b/engines/kyra/compress_kyra.h
index 08d63b9..2d84381 100644
--- a/engines/kyra/compress_kyra.h
+++ b/engines/kyra/compress_kyra.h
@@ -1,5 +1,8 @@
-/* compress_kyra_bun - compressor for kyra sound file packages
- * Copyright (C) 2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* compressor for kyra sound file packages */
+
 #ifndef COMPRESS_KYRA_H
 #define COMPRESS_KYRA_H
 
diff --git a/engines/kyra/dekyra.cpp b/engines/kyra/dekyra.cpp
index de235f0..65a411a 100644
--- a/engines/kyra/dekyra.cpp
+++ b/engines/kyra/dekyra.cpp
@@ -1,6 +1,8 @@
-/* DeKyra - Basic Kyrandia script disassembler
- * Copyright (C) 2004  Johannes Schickel
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Basic Kyrandia script disassembler */
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/engines/kyra/dekyra.h b/engines/kyra/dekyra.h
index 43e725a..665863c 100644
--- a/engines/kyra/dekyra.h
+++ b/engines/kyra/dekyra.h
@@ -1,6 +1,8 @@
-/* DeKyra - Basic Kyrandia script disassembler
- * Copyright (C) 2004  Johannes Schickel
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Basic Kyrandia script disassembler */
+
 #ifndef DEKYRA_H
 #define DEKYRA_H
 
diff --git a/engines/kyra/dekyra_v1.cpp b/engines/kyra/dekyra_v1.cpp
index 4df1c07..a68192f 100644
--- a/engines/kyra/dekyra_v1.cpp
+++ b/engines/kyra/dekyra_v1.cpp
@@ -1,5 +1,8 @@
-/* DeKyra - Basic Kyrandia script disassembler
- * Copyright (C) 2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Basic Kyrandia script disassembler */
+
 #include <stdio.h>
 
 #include "dekyra.h"
diff --git a/engines/kyra/extract_kyra.cpp b/engines/kyra/extract_kyra.cpp
index 0b39b3e..b78f11e 100644
--- a/engines/kyra/extract_kyra.cpp
+++ b/engines/kyra/extract_kyra.cpp
@@ -1,6 +1,8 @@
-/* extract_kyra - Extractor for Kyrandia .pak archives
- * Copyright (C) 2004  Johannes Schickel
- * Copyright (C) 2004-2008  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extractor for Kyrandia .pak archives */
+
 #include "extract_kyra.h"
 
 #include "kyra_pak.h"
diff --git a/engines/kyra/extract_kyra.h b/engines/kyra/extract_kyra.h
index a102028..45f8e0b 100644
--- a/engines/kyra/extract_kyra.h
+++ b/engines/kyra/extract_kyra.h
@@ -1,5 +1,8 @@
-/* Scumm Tools
- * Copyright (C) 2007 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/engines/kyra/kyra_ins.cpp b/engines/kyra/kyra_ins.cpp
index 2056d5f..c5983c5 100644
--- a/engines/kyra/kyra_ins.cpp
+++ b/engines/kyra/kyra_ins.cpp
@@ -1,5 +1,8 @@
-/* Scumm Tools
- * Copyright (C) 2008 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/engines/kyra/kyra_ins.h b/engines/kyra/kyra_ins.h
index d8921cb..9b1c0dd 100644
--- a/engines/kyra/kyra_ins.h
+++ b/engines/kyra/kyra_ins.h
@@ -1,5 +1,8 @@
-/* Scumm Tools
- * Copyright (C) 2008 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/engines/kyra/kyra_pak.cpp b/engines/kyra/kyra_pak.cpp
index 0a73d91..4f936fe 100644
--- a/engines/kyra/kyra_pak.cpp
+++ b/engines/kyra/kyra_pak.cpp
@@ -1,5 +1,8 @@
-/* Scumm Tools
- * Copyright (C) 2007 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/engines/kyra/kyra_pak.h b/engines/kyra/kyra_pak.h
index d450de8..9fe6804 100644
--- a/engines/kyra/kyra_pak.h
+++ b/engines/kyra/kyra_pak.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2002-2009 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/engines/mohawk/archive.cpp b/engines/mohawk/archive.cpp
index a2d5db3..794f5ac 100644
--- a/engines/mohawk/archive.cpp
+++ b/engines/mohawk/archive.cpp
@@ -1,5 +1,8 @@
-/* mohawk_file - Mohawk file parser
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Mohawk file parser */
+
 #include "engines/mohawk/archive.h"
 
 inline uint32 SWAP_BYTES_32(uint32 a) {
diff --git a/engines/mohawk/archive.h b/engines/mohawk/archive.h
index 9913cc3..4d508b3 100644
--- a/engines/mohawk/archive.h
+++ b/engines/mohawk/archive.h
@@ -1,5 +1,8 @@
-/* mohawk_file - Mohawk file parser
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Mohawk file parser */
+
 #ifndef MOHAWK_ARCHIVE_H
 #define MOHAWK_ARCHIVE_H
 
diff --git a/engines/mohawk/construct_mohawk.cpp b/engines/mohawk/construct_mohawk.cpp
index d467f0f..ca49d77 100644
--- a/engines/mohawk/construct_mohawk.cpp
+++ b/engines/mohawk/construct_mohawk.cpp
@@ -1,5 +1,8 @@
-/* construct_mohawk - Mohawk file constructor
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Mohawk file constructor */
+
 #include "common/scummsys.h"
 #include "common/array.h"
 #include "common/file.h"
diff --git a/engines/mohawk/deriven.cpp b/engines/mohawk/deriven.cpp
index a662432..6f1ccf5 100644
--- a/engines/mohawk/deriven.cpp
+++ b/engines/mohawk/deriven.cpp
@@ -1,5 +1,8 @@
-/* deriven - Riven script decompiler
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Riven script decompiler */
+
 #include "engines/mohawk/archive.h"
 #include "common/util.h"
 #include "engines/mohawk/utils/file.h"
diff --git a/engines/mohawk/extract_mohawk.cpp b/engines/mohawk/extract_mohawk.cpp
index 9042287..2e264a0 100644
--- a/engines/mohawk/extract_mohawk.cpp
+++ b/engines/mohawk/extract_mohawk.cpp
@@ -1,5 +1,8 @@
-/* extract_mohawk - Mohawk file extractor
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Mohawk file extractor */
+
 #include "engines/mohawk/archive.h"
 #include "common/util.h"
 #include "engines/mohawk/utils/file.h"
diff --git a/engines/parallaction/extract_parallaction.cpp b/engines/parallaction/extract_parallaction.cpp
index 5b042c8..ee89c78 100644
--- a/engines/parallaction/extract_parallaction.cpp
+++ b/engines/parallaction/extract_parallaction.cpp
@@ -1,5 +1,8 @@
-/* extract_parallaction - Extractor for Nippon Safe archives
- * Copyright (C) 2007 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extractor for Nippon Safe archives */
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/engines/parallaction/extract_parallaction.h b/engines/parallaction/extract_parallaction.h
index 52167b5..4b89cf7 100644
--- a/engines/parallaction/extract_parallaction.h
+++ b/engines/parallaction/extract_parallaction.h
@@ -1,5 +1,8 @@
-/* Scumm Tools
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/engines/pegasus/pegasus_save_types.cpp b/engines/pegasus/pegasus_save_types.cpp
index 271814e..47af63b 100755
--- a/engines/pegasus/pegasus_save_types.cpp
+++ b/engines/pegasus/pegasus_save_types.cpp
@@ -1,5 +1,8 @@
-/* pegasus_save_types - add creator and file type attributes to pegasus save files
- * Copyright (C) 2012 The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* add creator and file type attributes to pegasus save files */
+
 #include <stdio.h>
 #include <CoreServices/CoreServices.h>
 
diff --git a/engines/queen/compress_queen.cpp b/engines/queen/compress_queen.cpp
index 280c31d..41a0666 100644
--- a/engines/queen/compress_queen.cpp
+++ b/engines/queen/compress_queen.cpp
@@ -1,5 +1,8 @@
-/* compress_queen - Rebuild QUEEN.1 file to contain Resource Table (and optionally compress sound & speech)
- * Copyright (C) 2009  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Rebuild QUEEN.1 file to contain Resource Table (and optionally compress sound & speech) */
+
 #include <string.h>
 
 #include "common/util.h"
diff --git a/engines/queen/compress_queen.h b/engines/queen/compress_queen.h
index 596b6fb..0f01d42 100644
--- a/engines/queen/compress_queen.h
+++ b/engines/queen/compress_queen.h
@@ -1,5 +1,8 @@
-/* compress_queen - Rebuild QUEEN.1 file to contain Resource Table (and optionally compress sound & speech)
- * Copyright (C) 2009  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Rebuild QUEEN.1 file to contain Resource Table (and optionally compress sound & speech) */
+
 #ifndef COMPRESS_QUEEN_H
 #define COMPRESS_QUEEN_H
 
diff --git a/engines/saga/compress_saga.cpp b/engines/saga/compress_saga.cpp
index 29877bf..5bdbf71 100644
--- a/engines/saga/compress_saga.cpp
+++ b/engines/saga/compress_saga.cpp
@@ -1,7 +1,8 @@
-/* compress_saga - Compress SAGA engine digital sound files into
- * MP3 and Ogg Vorbis format
- * Copyright (C) 2004, Marcoen Hirschberg
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Compress SAGA engine digital sound files into MP3 and Ogg Vorbis format */
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/engines/saga/compress_saga.h b/engines/saga/compress_saga.h
index caa5860..2a6df73 100644
--- a/engines/saga/compress_saga.h
+++ b/engines/saga/compress_saga.h
@@ -1,7 +1,8 @@
-/* compress_saga - Compress SAGA engine digital sound files into
- * MP3 and Ogg Vorbis format
- * Copyright (C) 2004, Marcoen Hirschberg
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Compress SAGA engine digital sound files into MP3 and Ogg Vorbis format */
+
 #ifndef COMPRESS_SAGA_H
 #define COMPRESS_SAGA_H
 
diff --git a/engines/sci/compress_sci.cpp b/engines/sci/compress_sci.cpp
index 298d74b..2ca9e3f 100644
--- a/engines/sci/compress_sci.cpp
+++ b/engines/sci/compress_sci.cpp
@@ -1,5 +1,8 @@
-/* compress_sci - resource.aud/resource.sfx compressor
- * Copyright (C) 2009 The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-// by m_kiewitz
+/* resource.aud/resource.sfx compressor */
 
 #include <stdlib.h>
 
diff --git a/engines/sci/compress_sci.h b/engines/sci/compress_sci.h
index 2ce4331..fba9824 100644
--- a/engines/sci/compress_sci.h
+++ b/engines/sci/compress_sci.h
@@ -1,5 +1,8 @@
-/* compress_sci - resource.aud/resource.sfx compressor
- * Copyright (C) 2009 The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* resource.aud/resource.sfx compressor */
+
 #ifndef COMPRESS_SCI_H
 #define COMPRESS_SCI_H
 
diff --git a/engines/scumm/compress_scumm_bun.cpp b/engines/scumm/compress_scumm_bun.cpp
index bbdf1ff..0707c06 100644
--- a/engines/scumm/compress_scumm_bun.cpp
+++ b/engines/scumm/compress_scumm_bun.cpp
@@ -1,5 +1,8 @@
-/* compress_scumm_bun - compressor for bundle files
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* compressor for bundle files */
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/engines/scumm/compress_scumm_bun.h b/engines/scumm/compress_scumm_bun.h
index 8a97328..63b9c0f 100644
--- a/engines/scumm/compress_scumm_bun.h
+++ b/engines/scumm/compress_scumm_bun.h
@@ -1,5 +1,8 @@
-/* compress_scumm_bun - compressor for bundle files
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* compressor for bundle files */
+
 #ifndef COMPRESS_SCUMM_BUN_H
 #define COMPRESS_SCUMM_BUN_H
 
diff --git a/engines/scumm/compress_scumm_san.cpp b/engines/scumm/compress_scumm_san.cpp
index dd9122d..5fd6a4d 100644
--- a/engines/scumm/compress_scumm_san.cpp
+++ b/engines/scumm/compress_scumm_san.cpp
@@ -1,5 +1,8 @@
-/* compress_scumm_san - compressor for smush san files
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* compressor for smush san files */
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/engines/scumm/compress_scumm_san.h b/engines/scumm/compress_scumm_san.h
index 9edc853..e899f8e 100644
--- a/engines/scumm/compress_scumm_san.h
+++ b/engines/scumm/compress_scumm_san.h
@@ -1,5 +1,8 @@
-/* compress_scumm_san - compressor for smush san files
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* compressor for smush san files */
+
 #ifndef COMPRESS_SCUMM_SAN_H
 #define COMPRESS_SCUMM_SAN_H
 
diff --git a/engines/scumm/compress_scumm_sou.cpp b/engines/scumm/compress_scumm_sou.cpp
index abf625e..36d7603 100644
--- a/engines/scumm/compress_scumm_sou.cpp
+++ b/engines/scumm/compress_scumm_sou.cpp
@@ -1,5 +1,8 @@
-/* compress_scumm_sou - monster.sou to MP3-compressed monster.so3 converter
- * Copyright (C) 2002-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* monster.sou to MP3-compressed monster.so3 converter */
+
 #include <assert.h>
 #include <string.h>
 
diff --git a/engines/scumm/compress_scumm_sou.h b/engines/scumm/compress_scumm_sou.h
index 8e62b7e..bd8f166 100644
--- a/engines/scumm/compress_scumm_sou.h
+++ b/engines/scumm/compress_scumm_sou.h
@@ -1,5 +1,8 @@
-/* compress_scumm_sou - monster.sou to MP3-compressed monster.so3 converter
- * Copyright (C) 2009 The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* monster.sou to MP3-compressed monster.so3 converter */
+
 #ifndef COMPRESS_SCUMM_SOU_H
 #define COMPRESS_SCUMM_SOU_H
 
diff --git a/engines/scumm/descumm-common.cpp b/engines/scumm/descumm-common.cpp
index bd6ca6c..6c980d3 100644
--- a/engines/scumm/descumm-common.cpp
+++ b/engines/scumm/descumm-common.cpp
@@ -1,6 +1,8 @@
-/* DeScumm - Scumm Script Disassembler (common code)
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2002-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Scumm Script Disassembler (common code) */
+
 #include <string.h>
 #include <stdio.h>
 
diff --git a/engines/scumm/descumm-tool.cpp b/engines/scumm/descumm-tool.cpp
index bb188a0..624e22b 100644
--- a/engines/scumm/descumm-tool.cpp
+++ b/engines/scumm/descumm-tool.cpp
@@ -1,6 +1,8 @@
-/* DeScumm - Scumm Script Disassembler
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2002-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Scumm Script Disassembler */
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/engines/scumm/descumm.cpp b/engines/scumm/descumm.cpp
index 99238a8..35b081a 100644
--- a/engines/scumm/descumm.cpp
+++ b/engines/scumm/descumm.cpp
@@ -1,6 +1,8 @@
-/* DeScumm - Scumm Script Disassembler (version 2-5 scripts)
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2002-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Scumm Script Disassembler (version 2-5 scripts) */
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/engines/scumm/descumm.h b/engines/scumm/descumm.h
index 09f05c2..593c1c1 100644
--- a/engines/scumm/descumm.h
+++ b/engines/scumm/descumm.h
@@ -1,6 +1,8 @@
-/* DeScumm - Scumm Script Disassembler
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2002-2006 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Scumm Script Disassembler */
+
 #ifndef DESCUMM_H
 #define DESCUMM_H
 
diff --git a/engines/scumm/descumm6.cpp b/engines/scumm/descumm6.cpp
index 3b0452c..0d4748c 100644
--- a/engines/scumm/descumm6.cpp
+++ b/engines/scumm/descumm6.cpp
@@ -1,6 +1,8 @@
-/* DeScumm - Scumm Script Disassembler (version 6-8 scripts)
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2002-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Scumm Script Disassembler (version 6-8 scripts) */
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/engines/scumm/extract_loom_tg16.cpp b/engines/scumm/extract_loom_tg16.cpp
index 1015266..fefaa12 100644
--- a/engines/scumm/extract_loom_tg16.cpp
+++ b/engines/scumm/extract_loom_tg16.cpp
@@ -1,5 +1,8 @@
-/* extract_loom_tg16 - Extract data files from TG16 version of Loom
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extract data files from TG16 version of Loom */
+
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/engines/scumm/extract_loom_tg16.h b/engines/scumm/extract_loom_tg16.h
index e53943d..03bca9c 100644
--- a/engines/scumm/extract_loom_tg16.h
+++ b/engines/scumm/extract_loom_tg16.h
@@ -1,5 +1,8 @@
-/* extract_loom_tg16 - Extract data files from TG16 version of Loom
- * Copyright (C) 2009  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extract data files from TG16 version of Loom */
+
 #ifndef EXTRACT_LOOM_TG16_H
 #define EXTRACT_LOOM_TG16_H
 
diff --git a/engines/scumm/extract_mm_apple.cpp b/engines/scumm/extract_mm_apple.cpp
index 3f8a337..1ddf659 100644
--- a/engines/scumm/extract_mm_apple.cpp
+++ b/engines/scumm/extract_mm_apple.cpp
@@ -1,5 +1,8 @@
-/* extract_mm_apple - Extract data files from Apple II version of Maniac Mansion
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extract data files from Apple II version of Maniac Mansion */
+
 #include <stdarg.h>
 #include <stdio.h>
 #include "extract_mm_apple.h"
diff --git a/engines/scumm/extract_mm_apple.h b/engines/scumm/extract_mm_apple.h
index b19bbab..106ef72 100644
--- a/engines/scumm/extract_mm_apple.h
+++ b/engines/scumm/extract_mm_apple.h
@@ -1,5 +1,8 @@
-/* extract_mm_apple - Extract data files from Apple II version of Maniac Mansion
- * Copyright (C) 2009  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extract data files from Apple II version of Maniac Mansion */
+
 #ifndef EXTRACT_MM_APPLE_H
 #define EXTRACT_MM_APPLE_H
 
diff --git a/engines/scumm/extract_mm_c64.cpp b/engines/scumm/extract_mm_c64.cpp
index 26de399..ba8384b 100644
--- a/engines/scumm/extract_mm_c64.cpp
+++ b/engines/scumm/extract_mm_c64.cpp
@@ -1,5 +1,8 @@
-/* extract_mm_c64 - Extract data files from C64 version of Maniac Mansion
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extract data files from C64 version of Maniac Mansion */
+
 #include <stdarg.h>
 #include <stdio.h>
 #include "extract_mm_c64.h"
diff --git a/engines/scumm/extract_mm_c64.h b/engines/scumm/extract_mm_c64.h
index 0161923..7288168 100644
--- a/engines/scumm/extract_mm_c64.h
+++ b/engines/scumm/extract_mm_c64.h
@@ -1,5 +1,8 @@
-/* extract_mm_c64 - Extract data files from C64 version of Maniac Mansion
- * Copyright (C) 2009  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extract data files from C64 version of Maniac Mansion */
+
 #ifndef EXTRACT_MM_C64_H
 #define EXTRACT_MM_C64_H
 
diff --git a/engines/scumm/extract_mm_nes.cpp b/engines/scumm/extract_mm_nes.cpp
index b347bd1..dc58400 100644
--- a/engines/scumm/extract_mm_nes.cpp
+++ b/engines/scumm/extract_mm_nes.cpp
@@ -1,5 +1,8 @@
-/* extract_mm_nes - Extract data files from NES version of Maniac Mansion
- * Copyright (C) 2004-2008  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extract data files from NES version of Maniac Mansion */
+
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/engines/scumm/extract_mm_nes.h b/engines/scumm/extract_mm_nes.h
index ec43e01..e8889ab 100644
--- a/engines/scumm/extract_mm_nes.h
+++ b/engines/scumm/extract_mm_nes.h
@@ -1,5 +1,8 @@
-/* extract_mm_nes - Extract data files from NES version of Maniac Mansion
- * Copyright (C) 2009 The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extract data files from NES version of Maniac Mansion */
+
 #ifndef EXTRACT_MM_NES_H
 #define EXTRACT_MM_NES_H
 
diff --git a/engines/scumm/extract_scumm_mac.cpp b/engines/scumm/extract_scumm_mac.cpp
index b0c2099..3d48696 100644
--- a/engines/scumm/extract_scumm_mac.cpp
+++ b/engines/scumm/extract_scumm_mac.cpp
@@ -1,6 +1,8 @@
-/* extract_scumm_mac - Split one-big-file Macintosh game data into seperate .00x files for ScummVM
- * Copyright (C) 2001-2003  Casey Hutchinson
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Split one-big-file Macintosh game data into seperate .00x files for ScummVM */
+
 #include "extract_scumm_mac.h"
 
 #include <algorithm>
diff --git a/engines/scumm/extract_scumm_mac.h b/engines/scumm/extract_scumm_mac.h
index 9545c87..8513c0a 100644
--- a/engines/scumm/extract_scumm_mac.h
+++ b/engines/scumm/extract_scumm_mac.h
@@ -1,5 +1,8 @@
-/* encode_dxa - compressor for dxa files
- * Copyright (c) 2009 The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* compressor for dxa files */
 
 #ifndef EXTRACT_SCUMM_MAC_H
 #define EXTRACT_SCUMM_MAC_H
diff --git a/engines/scumm/extract_zak_c64.cpp b/engines/scumm/extract_zak_c64.cpp
index 010eb30..d4825a5 100644
--- a/engines/scumm/extract_zak_c64.cpp
+++ b/engines/scumm/extract_zak_c64.cpp
@@ -1,5 +1,8 @@
-/* extract_zak_c64 - Extract data files from C64 version of Zak McKracken
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extract data files from C64 version of Zak McKracken */
+
 #include <stdio.h>
 #include <stdarg.h>
 #include "extract_zak_c64.h"
diff --git a/engines/scumm/extract_zak_c64.h b/engines/scumm/extract_zak_c64.h
index 3ca47c2..2adcd1f 100644
--- a/engines/scumm/extract_zak_c64.h
+++ b/engines/scumm/extract_zak_c64.h
@@ -1,5 +1,8 @@
-/* extract_zak_c64 - Extract data files from C64 version of Zak McKracken
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extract data files from C64 version of Zak McKracken */
+
 #ifndef EXTRACT_ZAK_C64_H
 #define EXTRACT_ZAK_C64_H
 
diff --git a/engines/sword1/compress_sword1.cpp b/engines/sword1/compress_sword1.cpp
index 5af6f2e..75f9f26 100644
--- a/engines/sword1/compress_sword1.cpp
+++ b/engines/sword1/compress_sword1.cpp
@@ -1,5 +1,8 @@
-/* compress_sword1 - Compress Broken Sword I sound clusters into MP3/Ogg Vorbis
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Compress Broken Sword I sound clusters into MP3/Ogg Vorbis */
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/engines/sword1/compress_sword1.h b/engines/sword1/compress_sword1.h
index 8770572..cd7dfe3 100644
--- a/engines/sword1/compress_sword1.h
+++ b/engines/sword1/compress_sword1.h
@@ -1,5 +1,8 @@
-/* compress_sword1 - Compress Broken Sword I sound clusters into MP3/Ogg Vorbis
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Compress Broken Sword I sound clusters into MP3/Ogg Vorbis */
+
 #ifndef COMPRESS_SWORD1_H
 #define COMPRESS_SWORD1_H
 
diff --git a/engines/sword2/compress_sword2.cpp b/engines/sword2/compress_sword2.cpp
index 1539b1d..fecec53 100644
--- a/engines/sword2/compress_sword2.cpp
+++ b/engines/sword2/compress_sword2.cpp
@@ -1,5 +1,8 @@
-/* compress_sword2 - Compress Broken Sword II sound clusters into MP3/Ogg Vorbis
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Compress Broken Sword II sound clusters into MP3/Ogg Vorbis */
 
 #include "compress_sword2.h"
 
diff --git a/engines/sword2/compress_sword2.h b/engines/sword2/compress_sword2.h
index 24f3b7b..bcf9b99 100644
--- a/engines/sword2/compress_sword2.h
+++ b/engines/sword2/compress_sword2.h
@@ -1,5 +1,8 @@
-/* compress_sword2 - Compress Broken Sword II sound clusters into MP3/Ogg Vorbis
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Compress Broken Sword II sound clusters into MP3/Ogg Vorbis */
+
 #ifndef COMPRESS_SWORD2_H
 #define COMPRESS_SWORD2_H
 
diff --git a/engines/sword2/desword2.cpp b/engines/sword2/desword2.cpp
index d186036..69d0f74 100644
--- a/engines/sword2/desword2.cpp
+++ b/engines/sword2/desword2.cpp
@@ -1,5 +1,8 @@
-/* Script disassembler for Broken Sword II
- * Copyright (C) 2003-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Script disassembler for Broken Sword II */
+
 #include <stdlib.h>
 #include <stdio.h>
 
diff --git a/engines/sword2/sword2_clue.cpp b/engines/sword2/sword2_clue.cpp
index 6189b0d..af905c0 100644
--- a/engines/sword2/sword2_clue.cpp
+++ b/engines/sword2/sword2_clue.cpp
@@ -1,5 +1,8 @@
-/* clue - Extremely primitive "CLUster Explorer" for Broken Sword 2
- * Copyright (C) 2006 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Extremely primitive "CLUster Explorer" for Broken Sword 2 */
+
 #include "common/file.h"
 #include "common/util.h"
 
diff --git a/engines/tinsel/compress_tinsel.cpp b/engines/tinsel/compress_tinsel.cpp
index f89397c..19e71b7 100644
--- a/engines/tinsel/compress_tinsel.cpp
+++ b/engines/tinsel/compress_tinsel.cpp
@@ -1,5 +1,8 @@
-/* compress_tinsel - .smp compressor
- * Copyright (C) 2009 The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-// By Jimi (m [underline] kiewitz [AT] users.sourceforge.net)
+/* .smp compressor */
 
 #include <stdlib.h>
 
diff --git a/engines/tinsel/compress_tinsel.h b/engines/tinsel/compress_tinsel.h
index 952a5e8..5c44fd4 100644
--- a/engines/tinsel/compress_tinsel.h
+++ b/engines/tinsel/compress_tinsel.h
@@ -1,5 +1,8 @@
-/* compress_tinsel - .smp compressor
- * Copyright (C) 2009 The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* .smp compressor */
+
 #ifndef COMPRESS_TINSEL_H
 #define COMPRESS_TINSEL_H
 
diff --git a/engines/touche/compress_touche.cpp b/engines/touche/compress_touche.cpp
index 143d5a7..4cc6803 100644
--- a/engines/touche/compress_touche.cpp
+++ b/engines/touche/compress_touche.cpp
@@ -1,5 +1,8 @@
-/* compress_touche - Compress Touche Speech Data Files
- * Copyright (C) 2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Compress Touche Speech Data Files */
+
 #include <string.h>
 #include <stdio.h>
 
diff --git a/engines/touche/compress_touche.h b/engines/touche/compress_touche.h
index 432acb7..ddf7305 100644
--- a/engines/touche/compress_touche.h
+++ b/engines/touche/compress_touche.h
@@ -1,5 +1,8 @@
-/* compress_touche - Compress Touche Speech Data Files
- * Copyright (C) 2009  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Compress Touche Speech Data Files */
+
 #ifndef COMPRESS_TOUCHE_H
 #define COMPRESS_TOUCHE_H
 
diff --git a/engines/tucker/compress_tucker.cpp b/engines/tucker/compress_tucker.cpp
index 2235ff6..8bc1538 100644
--- a/engines/tucker/compress_tucker.cpp
+++ b/engines/tucker/compress_tucker.cpp
@@ -1,5 +1,8 @@
-/* compress_tucker - Compress Bud Tucker Sound Data Files
- * Copyright (C) 2008  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Compress Bud Tucker Sound Data Files */
+
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/engines/tucker/compress_tucker.h b/engines/tucker/compress_tucker.h
index 5c05f1a..896c8cf 100644
--- a/engines/tucker/compress_tucker.h
+++ b/engines/tucker/compress_tucker.h
@@ -1,5 +1,8 @@
-/* compress_tucker - Compress Bud Tucker Sound Data Files
- * Copyright (C) 2009  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Compress Bud Tucker Sound Data Files */
+
 #ifndef COMPRESS_TUCKER_H
 #define COMPRESS_TUCKER_H
 
diff --git a/example_tool.cpp b/example_tool.cpp
index 74df25e..cccd555 100644
--- a/example_tool.cpp
+++ b/example_tool.cpp
@@ -1,5 +1,8 @@
-/* example_tool - A tool example, for hepling future coders (and current)
- * Copyright (C) 2009  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-/* Example of a compression tool
+/* Example of a compression tool for helping future (and current) coders.
  * We require compression.h for the basic functions and utility classes
  */
 #include "tool.h"
diff --git a/gui/configuration.cpp b/gui/configuration.cpp
index 1fb4d64..c4a022a 100644
--- a/gui/configuration.cpp
+++ b/gui/configuration.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2002-2009 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/configuration.h b/gui/configuration.h
index b57dda3..a6b4f49 100644
--- a/gui/configuration.h
+++ b/gui/configuration.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2002-2009 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/gui/gui_tools.cpp b/gui/gui_tools.cpp
index 16b47b4..0d82bb8 100644
--- a/gui/gui_tools.cpp
+++ b/gui/gui_tools.cpp
@@ -1,5 +1,8 @@
-/* tools.cpp - List & description of all supported tools
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* List & description of all supported tools */
+
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
diff --git a/gui/gui_tools.h b/gui/gui_tools.h
index 15b9515..511668f 100644
--- a/gui/gui_tools.h
+++ b/gui/gui_tools.h
@@ -1,5 +1,8 @@
-/* tools.h - List & description of all supported tools
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* List & description of all the supported tools */
+
 #ifndef GUI_TOOLS_H
 #define GUI_TOOLS_H
 
diff --git a/gui/main.cpp b/gui/main.cpp
index 8f37201..848bd05 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -1,5 +1,8 @@
-/* main.cpp - Main entry point for the tool GUI
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Main entry point for the tool GUI */
+
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
diff --git a/gui/main.h b/gui/main.h
index 33000bb..d2453ff 100644
--- a/gui/main.h
+++ b/gui/main.h
@@ -1,5 +1,8 @@
-/* main.h - Main window classes for the tool GUI
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Main  window classes for the tool GUI */
+
 #ifndef GUI_MAIN_H
 #define GUI_MAIN_H
 
diff --git a/gui/pages.cpp b/gui/pages.cpp
index b40c789..8e3f449 100644
--- a/gui/pages.cpp
+++ b/gui/pages.cpp
@@ -1,5 +1,8 @@
-/* pages.cpp - All the pages in the wizard
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* All the pages in the wizard */
+
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
diff --git a/gui/pages.h b/gui/pages.h
index 8829d74..3d01ed2 100644
--- a/gui/pages.h
+++ b/gui/pages.h
@@ -1,5 +1,8 @@
-/* pages.h - All the pages in the wizard
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* All the pages in the wizard */
+
 #include <wx/wx.h>
 #include <wx/thread.h>
 
diff --git a/main_cli.cpp b/main_cli.cpp
index 78e85d1..394614c 100644
--- a/main_cli.cpp
+++ b/main_cli.cpp
@@ -1,5 +1,8 @@
-/* main_cli.cpp - Main entry point for the CLI tool, very thin
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Main entry point for CLI tool */
+
 #include "scummvm-tools-cli.h"
 
 int main(int argc, char *argv[]) {
diff --git a/sci/classes.cpp b/sci/classes.cpp
index 2fbe873..b29dd1e 100644
--- a/sci/classes.cpp
+++ b/sci/classes.cpp
@@ -1,3 +1,24 @@
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * 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.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/sci/graphics_png.h b/sci/graphics_png.h
index 3a174e3..a561c67 100644
--- a/sci/graphics_png.h
+++ b/sci/graphics_png.h
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sci/listwords.cpp b/sci/listwords.cpp
index 880a88b..6c7ae2f 100644
--- a/sci/listwords.cpp
+++ b/sci/listwords.cpp
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sci/musicplayer.cpp b/sci/musicplayer.cpp
index 6090d17..1b96c9b 100644
--- a/sci/musicplayer.cpp
+++ b/sci/musicplayer.cpp
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sci/old_objects.cpp b/sci/old_objects.cpp
index b35a7de..ed95a55 100644
--- a/sci/old_objects.cpp
+++ b/sci/old_objects.cpp
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sci/old_objects.h b/sci/old_objects.h
index 1ec2ded..6701e14 100644
--- a/sci/old_objects.h
+++ b/sci/old_objects.h
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sci/scidisasm.cpp b/sci/scidisasm.cpp
index cbff209..ea04ba8 100644
--- a/sci/scidisasm.cpp
+++ b/sci/scidisasm.cpp
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sci/scipack.cpp b/sci/scipack.cpp
index e49b6bc..6b20230 100644
--- a/sci/scipack.cpp
+++ b/sci/scipack.cpp
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sci/sciunpack.cpp b/sci/sciunpack.cpp
index f8fbcc0..1670c3e 100644
--- a/sci/sciunpack.cpp
+++ b/sci/sciunpack.cpp
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sci/sciunpack.h b/sci/sciunpack.h
index 5fac6d4..a49a5fa 100644
--- a/sci/sciunpack.h
+++ b/sci/sciunpack.h
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sci/scriptdump.cpp b/sci/scriptdump.cpp
index b28841e..4874fd6 100644
--- a/sci/scriptdump.cpp
+++ b/sci/scriptdump.cpp
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sci/util.h b/sci/util.h
index ba30c91..bc784bd 100644
--- a/sci/util.h
+++ b/sci/util.h
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sci/vocabdump.cpp b/sci/vocabdump.cpp
index eb15073..0a015fd 100644
--- a/sci/vocabdump.cpp
+++ b/sci/vocabdump.cpp
@@ -1,8 +1,8 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM Tools
  *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/scummvm-tools-cli.cpp b/scummvm-tools-cli.cpp
index 978b34d..dba0622 100644
--- a/scummvm-tools-cli.cpp
+++ b/scummvm-tools-cli.cpp
@@ -1,5 +1,8 @@
-/* tools_cli - CLI interface for the tools
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* CLI interface for the tools */
+
 #include <iostream>
 #include <algorithm>
 #include <assert.h>
diff --git a/scummvm-tools-cli.h b/scummvm-tools-cli.h
index c7e6fd2..7dbcd57 100644
--- a/scummvm-tools-cli.h
+++ b/scummvm-tools-cli.h
@@ -1,5 +1,8 @@
-/* tools_cli - CLI interface for the tools
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sound/adpcm.cpp b/sound/adpcm.cpp
index 0f1a979..5780a95 100644
--- a/sound/adpcm.cpp
+++ b/sound/adpcm.cpp
@@ -1,5 +1,8 @@
-/* Scumm Tools
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sound/adpcm.h b/sound/adpcm.h
index 1181e41..7852b25 100644
--- a/sound/adpcm.h
+++ b/sound/adpcm.h
@@ -1,5 +1,8 @@
-/* Scumm Tools
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp
index f81c3cd..45b8bfe 100644
--- a/sound/audiostream.cpp
+++ b/sound/audiostream.cpp
@@ -1,5 +1,8 @@
-/* Scumm Tools
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sound/audiostream.h b/sound/audiostream.h
index 0c9f8b7..9c47417 100644
--- a/sound/audiostream.h
+++ b/sound/audiostream.h
@@ -1,5 +1,8 @@
-/* Scumm Tools
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sound/voc.cpp b/sound/voc.cpp
index f190365..80c3d29 100644
--- a/sound/voc.cpp
+++ b/sound/voc.cpp
@@ -1,5 +1,8 @@
-/* Scumm Tools
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sound/voc.h b/sound/voc.h
index cc74400..b07cd90 100644
--- a/sound/voc.h
+++ b/sound/voc.h
@@ -1,5 +1,8 @@
-/* Scumm Tools
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sound/wave.cpp b/sound/wave.cpp
index 9e613d1..4797032 100644
--- a/sound/wave.cpp
+++ b/sound/wave.cpp
@@ -1,5 +1,8 @@
-/* Scumm Tools
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/sound/wave.h b/sound/wave.h
index 2736435..cf63cfb 100644
--- a/sound/wave.h
+++ b/sound/wave.h
@@ -1,5 +1,8 @@
-/* Scumm Tools
- * Copyright (C) 2004-2006  The ScummVM Team
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/tool.cpp b/tool.cpp
index 14f5575..10f3342 100644
--- a/tool.cpp
+++ b/tool.cpp
@@ -1,5 +1,8 @@
-/* tool.cpp - Common base class for all tools (implementation)
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Common base class for all tools (implementation) */
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tool.h b/tool.h
index 4eec06a..1b17b38 100644
--- a/tool.h
+++ b/tool.h
@@ -1,5 +1,8 @@
-/* tool.h - Common base class for all tools
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/tool_exception.h b/tool_exception.h
index 0ef1e77..fc900b6 100644
--- a/tool_exception.h
+++ b/tool_exception.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2002-2009 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/tools.cpp b/tools.cpp
index b95c1a2..af80aca 100644
--- a/tools.cpp
+++ b/tools.cpp
@@ -1,5 +1,8 @@
-/* tools - Interface for accessing all the tools in a conveinient fashion
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+/* Interface for accessing all the tools in a conveinient fashion */
 
 #include "tools.h"
 #include "tool.h"
diff --git a/tools.h b/tools.h
index 1b91c8e..f291c8c 100644
--- a/tools.h
+++ b/tools.h
@@ -1,5 +1,8 @@
-/* tools - Interface for accessing all the tools in a convenient fashion
- * Copyright (C) 2009 The ScummVM project
+/* ScummVM Tools
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/version.cpp b/version.cpp
index f1d384b..0f7d468 100644
--- a/version.cpp
+++ b/version.cpp
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2002-2009 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/version.h b/version.h
index 8a8bbfc..d9aadfc 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,8 @@
 /* ScummVM Tools
- * Copyright (C) 2002-2009 The ScummVM project
+ *
+ * ScummVM Tools is the legal property of its developers, whose
+ * names are too numerous to list here. Please refer to the
+ * COPYRIGHT file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License


Commit: 0e994ea305081b567b285678256f89a80c0b9770
    https://github.com/scummvm/scummvm-tools/commit/0e994ea305081b567b285678256f89a80c0b9770
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2014-01-19T10:13:40-08:00

Commit Message:
GIT: Ignore pegasus_save_types executable

Changed paths:
    .gitignore



diff --git a/.gitignore b/.gitignore
index 3c1dd12..ad6610d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@
 /desword2
 /extract_mohawk
 /gob_loadcalc
+/pegasus_save_types
 /ScummVM Tools.app
 /scummvm-tools
 /scummvm-tools-cli


Commit: 857f3c8d55504a80dcb8a937da4f920dc1974e35
    https://github.com/scummvm/scummvm-tools/commit/857f3c8d55504a80dcb8a937da4f920dc1974e35
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2014-01-19T10:13:41-08:00

Commit Message:
GIT: Ignore Mac DS_Store files

Changed paths:
    .gitignore



diff --git a/.gitignore b/.gitignore
index ad6610d..1380edb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,6 @@ ipch/
 *.vcxproj*
 *.bat
 *.tss
+
+#Ignore Mac DS_Store files
+.DS_Store






More information about the Scummvm-git-logs mailing list