Change CVS keywords to SVN keywords

svn-id: r20511

132 files changed, 265 insertions, 133 deletions

diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index fc8f07037b..7e6696680f 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/actor.h b/scumm/actor.h
index 1a877a7b77..2a6e49ed15 100644
--- a/scumm/actor.h
+++ b/scumm/actor.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/akos.cpp b/scumm/akos.cpp
index 52a50beb19..ff13949fb2 100644
--- a/scumm/akos.cpp
+++ b/scumm/akos.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/akos.h b/scumm/akos.h
index 86921166d7..1a849903d8 100644
--- a/scumm/akos.h
+++ b/scumm/akos.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/base-costume.cpp b/scumm/base-costume.cpp
index 1e2dcef8dd..e93b5b80cd 100644
--- a/scumm/base-costume.cpp
+++ b/scumm/base-costume.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/base-costume.h b/scumm/base-costume.h
index 12248b2655..e1d096dea9 100644
--- a/scumm/base-costume.h
+++ b/scumm/base-costume.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/bomp.cpp b/scumm/bomp.cpp
index cd530dbe77..f3f78e4731 100644
--- a/scumm/bomp.cpp
+++ b/scumm/bomp.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/bomp.h b/scumm/bomp.h
index c546ac9c0e..74d367172d 100644
--- a/scumm/bomp.h
+++ b/scumm/bomp.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/boxes.cpp b/scumm/boxes.cpp
index 6e4c57e1d8..4460519480 100644
--- a/scumm/boxes.cpp
+++ b/scumm/boxes.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/boxes.h b/scumm/boxes.h
index 70c6cd6c92..f5fb7160fd 100644
--- a/scumm/boxes.h
+++ b/scumm/boxes.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/camera.cpp b/scumm/camera.cpp
index 28e37f7751..cc6d9bfaed 100644
--- a/scumm/camera.cpp
+++ b/scumm/camera.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/charset.cpp b/scumm/charset.cpp
index 4ae6b85dad..e8086ed30a 100644
--- a/scumm/charset.cpp
+++ b/scumm/charset.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/scumm/charset.h b/scumm/charset.h
index 91981e0e96..3746f3be4e 100644
--- a/scumm/charset.h
+++ b/scumm/charset.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef CHARSET_H
diff --git a/scumm/costume.cpp b/scumm/costume.cpp
index ba7de087ce..48f81111c6 100644
--- a/scumm/costume.cpp
+++ b/scumm/costume.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/costume.h b/scumm/costume.h
index 511fc05379..56c97e0a8c 100644
--- a/scumm/costume.h
+++ b/scumm/costume.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef COSTUME_H
diff --git a/scumm/cursor.cpp b/scumm/cursor.cpp
index f663cfb092..6fee33e79b 100644
--- a/scumm/cursor.cpp
+++ b/scumm/cursor.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp
index d6013e003d..437f0a28e5 100644
--- a/scumm/debugger.cpp
+++ b/scumm/debugger.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 #include "common/stdafx.h"
@@ -451,7 +452,7 @@ bool ScummDebugger::Cmd_PrintObjects(int argc, const char **argv) {
 	DebugPrintf("|num |  x |  y |width|height|state|fl|   cls   |\n");
 	DebugPrintf("+----+----+----+-----+------+-----+--+---------+\n");
 
-	for (i = 1; (i < _vm->_numLocalObjects) && (_vm->_objs[i].obj_nr != 0) ; i++) {
+	for (i = 1; i < _vm->_numLocalObjects ; i++) {
 		o = &(_vm->_objs[i]);
 		DebugPrintf("|%4d|%4d|%4d|%5d|%6d|%5d|%2d|$%08x|\n",
 				o->obj_nr, o->x_pos, o->y_pos, o->width, o->height, o->state,
diff --git a/scumm/debugger.h b/scumm/debugger.h
index 069f683d45..664c28923d 100644
--- a/scumm/debugger.h
+++ b/scumm/debugger.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef DEBUGGER_H
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp
index 8491239e9b..eafd956251 100644
--- a/scumm/dialogs.cpp
+++ b/scumm/dialogs.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/scumm/dialogs.h b/scumm/dialogs.h
index 555e3f3565..60d796956e 100644
--- a/scumm/dialogs.h
+++ b/scumm/dialogs.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef SCUMM_DIALOGS_H
diff --git a/scumm/floodfill_he.cpp b/scumm/floodfill_he.cpp
index 930cca21ce..c7df765606 100644
--- a/scumm/floodfill_he.cpp
+++ b/scumm/floodfill_he.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/floodfill_he.h b/scumm/floodfill_he.h
index 50bb90abc3..7d0fa7073f 100644
--- a/scumm/floodfill_he.h
+++ b/scumm/floodfill_he.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index ae6d6fdda8..dc476a8f0b 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/gfx.h b/scumm/gfx.h
index 5824bbbaa6..9aa8461c2c 100644
--- a/scumm/gfx.h
+++ b/scumm/gfx.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/help.cpp b/scumm/help.cpp
index df8552de4c..acc9e67a6d 100644
--- a/scumm/help.cpp
+++ b/scumm/help.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/help.h b/scumm/help.h
index 6b222bd376..9691c09594 100644
--- a/scumm/help.h
+++ b/scumm/help.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index 3c512992a6..5d170e98b8 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/imuse.h b/scumm/imuse.h
index f569c2cfd6..0c9a9206ba 100644
--- a/scumm/imuse.h
+++ b/scumm/imuse.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp
index 26476f266b..c057cc8d85 100644
--- a/scumm/imuse_digi/dimuse.cpp
+++ b/scumm/imuse_digi/dimuse.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/scumm/imuse_digi/dimuse.h b/scumm/imuse_digi/dimuse.h
index 34d9e91098..fed2e48457 100644
--- a/scumm/imuse_digi/dimuse.h
+++ b/scumm/imuse_digi/dimuse.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #if !defined(IMUSE_DIGI_H) && !defined(DISABLE_SCUMM_7_8)
diff --git a/scumm/imuse_digi/dimuse_bndmgr.cpp b/scumm/imuse_digi/dimuse_bndmgr.cpp
index f603256e2a..d36d733ef2 100644
--- a/scumm/imuse_digi/dimuse_bndmgr.cpp
+++ b/scumm/imuse_digi/dimuse_bndmgr.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/scumm/imuse_digi/dimuse_bndmgr.h b/scumm/imuse_digi/dimuse_bndmgr.h
index 8080e670e2..36d4f5683e 100644
--- a/scumm/imuse_digi/dimuse_bndmgr.h
+++ b/scumm/imuse_digi/dimuse_bndmgr.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef BUNDLE_MGR_H
diff --git a/scumm/imuse_digi/dimuse_codecs.cpp b/scumm/imuse_digi/dimuse_codecs.cpp
index 559ca703db..dccae928b0 100644
--- a/scumm/imuse_digi/dimuse_codecs.cpp
+++ b/scumm/imuse_digi/dimuse_codecs.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/scumm/imuse_digi/dimuse_music.cpp b/scumm/imuse_digi/dimuse_music.cpp
index aec93dd242..4c0cedc57c 100644
--- a/scumm/imuse_digi/dimuse_music.cpp
+++ b/scumm/imuse_digi/dimuse_music.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/scumm/imuse_digi/dimuse_script.cpp b/scumm/imuse_digi/dimuse_script.cpp
index 0238aa0560..83deb91e54 100644
--- a/scumm/imuse_digi/dimuse_script.cpp
+++ b/scumm/imuse_digi/dimuse_script.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/scumm/imuse_digi/dimuse_sndmgr.cpp b/scumm/imuse_digi/dimuse_sndmgr.cpp
index 485f27a9c3..7d3d06f16e 100644
--- a/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/scumm/imuse_digi/dimuse_sndmgr.h b/scumm/imuse_digi/dimuse_sndmgr.h
index 698f28ba0a..5844fa0c1b 100644
--- a/scumm/imuse_digi/dimuse_sndmgr.h
+++ b/scumm/imuse_digi/dimuse_sndmgr.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef IMUSE_DIGI_SNDMGR_H
diff --git a/scumm/imuse_digi/dimuse_tables.cpp b/scumm/imuse_digi/dimuse_tables.cpp
index 74cfd74a07..f4fd25a160 100644
--- a/scumm/imuse_digi/dimuse_tables.cpp
+++ b/scumm/imuse_digi/dimuse_tables.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/scumm/imuse_digi/dimuse_track.cpp b/scumm/imuse_digi/dimuse_track.cpp
index 8d97f9017d..d1bd5b8923 100644
--- a/scumm/imuse_digi/dimuse_track.cpp
+++ b/scumm/imuse_digi/dimuse_track.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/scumm/imuse_internal.h b/scumm/imuse_internal.h
index e0f7de09cb..aa9b49cb00 100644
--- a/scumm/imuse_internal.h
+++ b/scumm/imuse_internal.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef DEFINED_IMUSE_INTERNAL
diff --git a/scumm/imuse_player.cpp b/scumm/imuse_player.cpp
index 05d450bcb4..06ebd289cd 100644
--- a/scumm/imuse_player.cpp
+++ b/scumm/imuse_player.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/scumm/input.cpp b/scumm/input.cpp
index 5d6fcb47e6..ad890604c4 100644
--- a/scumm/input.cpp
+++ b/scumm/input.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/insane/insane.cpp b/scumm/insane/insane.cpp
index 1eec89f2a1..08c982b65f 100644
--- a/scumm/insane/insane.cpp
+++ b/scumm/insane/insane.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/insane/insane.h b/scumm/insane/insane.h
index d54ec1af1b..36567ae06e 100644
--- a/scumm/insane/insane.h
+++ b/scumm/insane/insane.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/insane/insane_ben.cpp b/scumm/insane/insane_ben.cpp
index fadf6b646d..4e58fa14c9 100644
--- a/scumm/insane/insane_ben.cpp
+++ b/scumm/insane/insane_ben.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/insane/insane_enemy.cpp b/scumm/insane/insane_enemy.cpp
index 6f121ca4d5..d67fc7ae09 100644
--- a/scumm/insane/insane_enemy.cpp
+++ b/scumm/insane/insane_enemy.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/insane/insane_iact.cpp b/scumm/insane/insane_iact.cpp
index 331591e164..c706c7d191 100644
--- a/scumm/insane/insane_iact.cpp
+++ b/scumm/insane/insane_iact.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/insane/insane_scenes.cpp b/scumm/insane/insane_scenes.cpp
index a5faf4c9d8..7cc01fc2cf 100644
--- a/scumm/insane/insane_scenes.cpp
+++ b/scumm/insane/insane_scenes.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/instrument.cpp b/scumm/instrument.cpp
index 3d4b43bff1..6e688d89e5 100644
--- a/scumm/instrument.cpp
+++ b/scumm/instrument.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/scumm/instrument.h b/scumm/instrument.h
index 3294ab716a..eb1a30a1d1 100644
--- a/scumm/instrument.h
+++ b/scumm/instrument.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef INSTRUMENT_H
diff --git a/scumm/intern.h b/scumm/intern.h
index f3ab8a12a3..fae915a037 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/intern_he.h b/scumm/intern_he.h
index 1011d1b31f..26a9e0a40f 100644
--- a/scumm/intern_he.h
+++ b/scumm/intern_he.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/logic_he.cpp b/scumm/logic_he.cpp
index 3707a16448..76de561721 100644
--- a/scumm/logic_he.cpp
+++ b/scumm/logic_he.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/logic_he.h b/scumm/logic_he.h
index deb3ab1cd6..c237f6182c 100644
--- a/scumm/logic_he.h
+++ b/scumm/logic_he.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/midiparser_eup.cpp b/scumm/midiparser_eup.cpp
index 0caa8cc660..a9c40f99c5 100644
--- a/scumm/midiparser_eup.cpp
+++ b/scumm/midiparser_eup.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/midiparser_ro.cpp b/scumm/midiparser_ro.cpp
index fbd8b9ab44..b240ffb5fd 100644
--- a/scumm/midiparser_ro.cpp
+++ b/scumm/midiparser_ro.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/nut_renderer.cpp b/scumm/nut_renderer.cpp
index b412ed57ea..e7d3e6f7c9 100644
--- a/scumm/nut_renderer.cpp
+++ b/scumm/nut_renderer.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/scumm/nut_renderer.h b/scumm/nut_renderer.h
index 871a3ff105..8972fef949 100644
--- a/scumm/nut_renderer.h
+++ b/scumm/nut_renderer.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #if !defined(NUT_RENDERER_H) && !defined(DISABLE_SCUMM_7_8)
diff --git a/scumm/object.cpp b/scumm/object.cpp
index 84be805f87..0472edcc15 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/object.h b/scumm/object.h
index 5dae7b2a4c..edb779b5eb 100644
--- a/scumm/object.h
+++ b/scumm/object.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef OBJECT_H
diff --git a/scumm/palette.cpp b/scumm/palette.cpp
index 8b12ffa60e..d8b8f643f1 100644
--- a/scumm/palette.cpp
+++ b/scumm/palette.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/palette_he.cpp b/scumm/palette_he.cpp
index eb16847ee5..2d6a471d79 100644
--- a/scumm/palette_he.cpp
+++ b/scumm/palette_he.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/player_mod.cpp b/scumm/player_mod.cpp
index 71643f56d5..773d34732d 100644
--- a/scumm/player_mod.cpp
+++ b/scumm/player_mod.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/player_mod.h b/scumm/player_mod.h
index 2cb5452b8b..317bf7fd6e 100644
--- a/scumm/player_mod.h
+++ b/scumm/player_mod.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/player_nes.cpp b/scumm/player_nes.cpp
index ea46116a03..8564ac1e41 100644
--- a/scumm/player_nes.cpp
+++ b/scumm/player_nes.cpp
@@ -17,7 +17,8 @@
  * aint32 with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/player_nes.h b/scumm/player_nes.h
index 73964a8af9..17a11b2fe3 100644
--- a/scumm/player_nes.h
+++ b/scumm/player_nes.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/player_v1.cpp b/scumm/player_v1.cpp
index 41fbdf8ea7..74605b20d1 100644
--- a/scumm/player_v1.cpp
+++ b/scumm/player_v1.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/player_v1.h b/scumm/player_v1.h
index 42f31df951..60ba8ad26d 100644
--- a/scumm/player_v1.h
+++ b/scumm/player_v1.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/player_v2.cpp b/scumm/player_v2.cpp
index 6f7a4cde74..70aff98bb9 100644
--- a/scumm/player_v2.cpp
+++ b/scumm/player_v2.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/player_v2.h b/scumm/player_v2.h
index 2d21387fe6..160400e06a 100644
--- a/scumm/player_v2.h
+++ b/scumm/player_v2.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/player_v2a.cpp b/scumm/player_v2a.cpp
index 4dd58c1913..36499ba527 100644
--- a/scumm/player_v2a.cpp
+++ b/scumm/player_v2a.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/player_v2a.h b/scumm/player_v2a.h
index 99232de410..b2d25d67d5 100644
--- a/scumm/player_v2a.h
+++ b/scumm/player_v2a.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/player_v3a.cpp b/scumm/player_v3a.cpp
index 457352f5f4..32ab9754af 100644
--- a/scumm/player_v3a.cpp
+++ b/scumm/player_v3a.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/player_v3a.h b/scumm/player_v3a.h
index 36a367a456..351d8ece60 100644
--- a/scumm/player_v3a.h
+++ b/scumm/player_v3a.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index 9091a3e958..e1601ca991 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/resource.h b/scumm/resource.h
index 2415f09205..318582b5cb 100644
--- a/scumm/resource.h
+++ b/scumm/resource.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef RESOURCE_H
diff --git a/scumm/resource_v2.cpp b/scumm/resource_v2.cpp
index 52aff29a6e..26e96ec9ef 100644
--- a/scumm/resource_v2.cpp
+++ b/scumm/resource_v2.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/resource_v3.cpp b/scumm/resource_v3.cpp
index b072f0a8f8..510f106550 100644
--- a/scumm/resource_v3.cpp
+++ b/scumm/resource_v3.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/resource_v4.cpp b/scumm/resource_v4.cpp
index a05df89a39..0f8530af2d 100644
--- a/scumm/resource_v4.cpp
+++ b/scumm/resource_v4.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/resource_v7he.cpp b/scumm/resource_v7he.cpp
index 8c8ca2070a..6ce8446a9a 100644
--- a/scumm/resource_v7he.cpp
+++ b/scumm/resource_v7he.cpp
@@ -19,7 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/resource_v7he.h b/scumm/resource_v7he.h
index 22f2c0a1ac..1496aa3d7f 100644
--- a/scumm/resource_v7he.h
+++ b/scumm/resource_v7he.h
@@ -19,7 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/room.cpp b/scumm/room.cpp
index cc59c28706..e53b13c663 100644
--- a/scumm/room.cpp
+++ b/scumm/room.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index 74f8b7101a..9dca7abd40 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/saveload.h b/scumm/saveload.h
index 379024a0a5..dc2c3b5262 100644
--- a/scumm/saveload.h
+++ b/scumm/saveload.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/script.cpp b/scumm/script.cpp
index a3dee09d69..c6a971837f 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/script.h b/scumm/script.h
index d13183100c..e832aee8d9 100644
--- a/scumm/script.h
+++ b/scumm/script.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/script_c64.cpp b/scumm/script_c64.cpp
index 8bfb1cb8dc..2e8ff5f4d6 100644
--- a/scumm/script_c64.cpp
+++ b/scumm/script_c64.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index 8be1cc2248..790f65e021 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 33829da22e..880628f53e 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 800a214c7c..7a048d0a01 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index e4876b3b0d..77709eed21 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp
index 43320867a1..ce3f76bc18 100644
--- a/scumm/script_v6he.cpp
+++ b/scumm/script_v6he.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index b887920a13..021a74dcc3 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp
index 0c1b867afa..f615266131 100644
--- a/scumm/script_v7he.cpp
+++ b/scumm/script_v7he.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index 3ac41d51b6..b5f9f48466 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp
index 43a15db209..307ab75d3f 100644
--- a/scumm/script_v80he.cpp
+++ b/scumm/script_v80he.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index 64ad859c2e..0536506534 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 8b98fe882d..5cd9ef9111 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/scumm.h b/scumm/scumm.h
index d2ba99a355..5509378371 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/smush/channel.h b/scumm/smush/channel.h
index 700ca72231..52e64c8b2d 100644
--- a/scumm/smush/channel.h
+++ b/scumm/smush/channel.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/smush/chunk.cpp b/scumm/smush/chunk.cpp
index eb4456613d..60512cdf2f 100644
--- a/scumm/smush/chunk.cpp
+++ b/scumm/smush/chunk.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/smush/chunk.h b/scumm/smush/chunk.h
index 1ce0727a02..26290538a6 100644
--- a/scumm/smush/chunk.h
+++ b/scumm/smush/chunk.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/smush/chunk_type.h b/scumm/smush/chunk_type.h
index 38a1cf165c..18c49f0dbf 100644
--- a/scumm/smush/chunk_type.h
+++ b/scumm/smush/chunk_type.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/smush/codec1.cpp b/scumm/smush/codec1.cpp
index d7304da0e2..04d55e2ed7 100644
--- a/scumm/smush/codec1.cpp
+++ b/scumm/smush/codec1.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/smush/codec37.cpp b/scumm/smush/codec37.cpp
index 7948d09a54..732bffeeae 100644
--- a/scumm/smush/codec37.cpp
+++ b/scumm/smush/codec37.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/smush/codec37.h b/scumm/smush/codec37.h
index 1e8ca815c5..534316c1e5 100644
--- a/scumm/smush/codec37.h
+++ b/scumm/smush/codec37.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/smush/codec47.cpp b/scumm/smush/codec47.cpp
index 8a49880b92..ef10a282a9 100644
--- a/scumm/smush/codec47.cpp
+++ b/scumm/smush/codec47.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/smush/codec47.h b/scumm/smush/codec47.h
index 52e6d359ff..ea71c22963 100644
--- a/scumm/smush/codec47.h
+++ b/scumm/smush/codec47.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/smush/imuse_channel.cpp b/scumm/smush/imuse_channel.cpp
index fd643ed002..76a10a9e9e 100644
--- a/scumm/smush/imuse_channel.cpp
+++ b/scumm/smush/imuse_channel.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/smush/saud_channel.cpp b/scumm/smush/saud_channel.cpp
index 41fb443d54..2277336570 100644
--- a/scumm/smush/saud_channel.cpp
+++ b/scumm/smush/saud_channel.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/smush/smush_font.cpp b/scumm/smush/smush_font.cpp
index 5171611983..96d9e2f7c5 100644
--- a/scumm/smush/smush_font.cpp
+++ b/scumm/smush/smush_font.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/smush/smush_font.h b/scumm/smush/smush_font.h
index 8fb5eec03b..724eb46658 100644
--- a/scumm/smush/smush_font.h
+++ b/scumm/smush/smush_font.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp
index ac2e640f65..00a50321da 100644
--- a/scumm/smush/smush_mixer.cpp
+++ b/scumm/smush/smush_mixer.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/smush/smush_mixer.h b/scumm/smush/smush_mixer.h
index fd31446076..2a7c2d3ebc 100644
--- a/scumm/smush/smush_mixer.h
+++ b/scumm/smush/smush_mixer.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index 06e1af0cd8..926e7f9f87 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/smush/smush_player.h b/scumm/smush/smush_player.h
index 4564a92e48..f697057d89 100644
--- a/scumm/smush/smush_player.h
+++ b/scumm/smush/smush_player.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index f3a6168de3..26f0c712c8 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/sound.h b/scumm/sound.h
index 6a8d740d18..0b913fe7e3 100644
--- a/scumm/sound.h
+++ b/scumm/sound.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef SOUND_H
diff --git a/scumm/sound_he.cpp b/scumm/sound_he.cpp
index 8cf2084f1f..879e34a99e 100644
--- a/scumm/sound_he.cpp
+++ b/scumm/sound_he.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp
index 6c9dae3553..a6065eb7be 100644
--- a/scumm/sprite_he.cpp
+++ b/scumm/sprite_he.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/sprite_he.h b/scumm/sprite_he.h
index 84718a22e2..5396c1fed4 100644
--- a/scumm/sprite_he.h
+++ b/scumm/sprite_he.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/string.cpp b/scumm/string.cpp
index 9190d0e41e..c32413542d 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/thumbnail.cpp b/scumm/thumbnail.cpp
index d18bcd49f5..eefc34286a 100644
--- a/scumm/thumbnail.cpp
+++ b/scumm/thumbnail.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/usage_bits.cpp b/scumm/usage_bits.cpp
index 874bc2b838..3fd90311fd 100644
--- a/scumm/usage_bits.cpp
+++ b/scumm/usage_bits.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/usage_bits.h b/scumm/usage_bits.h
index fc1d7ae775..36fd7cc610 100644
--- a/scumm/usage_bits.h
+++ b/scumm/usage_bits.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/util.cpp b/scumm/util.cpp
index 3871a1d204..70e3a3e467 100644
--- a/scumm/util.cpp
+++ b/scumm/util.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/util.h b/scumm/util.h
index a1391cad4b..99d75cf127 100644
--- a/scumm/util.h
+++ b/scumm/util.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/vars.cpp b/scumm/vars.cpp
index 052e180430..1cdc446637 100644
--- a/scumm/vars.cpp
+++ b/scumm/vars.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/verbs.cpp b/scumm/verbs.cpp
index 65adfdd35a..7b01527b92 100644
--- a/scumm/verbs.cpp
+++ b/scumm/verbs.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/verbs.h b/scumm/verbs.h
index 6d6bcc0ae3..87cf7f3955 100644
--- a/scumm/verbs.h
+++ b/scumm/verbs.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef VERBS_H
diff --git a/scumm/wiz_he.cpp b/scumm/wiz_he.cpp
index dbe65fd195..9b0f9c3f15 100644
--- a/scumm/wiz_he.cpp
+++ b/scumm/wiz_he.cpp
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */
 
diff --git a/scumm/wiz_he.h b/scumm/wiz_he.h
index 7b37cb1eab..86d3e97721 100644
--- a/scumm/wiz_he.h
+++ b/scumm/wiz_he.h
@@ -16,7 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  *
  */