diff --git a/rosapps/applications/cmdutils/mode/mode.rc b/rosapps/applications/cmdutils/mode/mode.rc
index 29e28a5b939..44ca8c4d32c 100644
--- a/rosapps/applications/cmdutils/mode/mode.rc
+++ b/rosapps/applications/cmdutils/mode/mode.rc
@@ -1,4 +1,3 @@
-/* $Id: mode.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS mode utility\0"
 #define REACTOS_STR_INTERNAL_NAME	"mode\0"
diff --git a/rosapps/applications/cmdutils/sort/sort.rc b/rosapps/applications/cmdutils/sort/sort.rc
index 22e3c4d11f1..e3418a39524 100644
--- a/rosapps/applications/cmdutils/sort/sort.rc
+++ b/rosapps/applications/cmdutils/sort/sort.rc
@@ -1,4 +1,3 @@
-/* $Id: sort.rc 18066 2005-09-25 19:38:46Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 sort command\0"
 #define REACTOS_STR_INTERNAL_NAME	"sort\0"
diff --git a/rosapps/applications/cmdutils/tee/tee.rc b/rosapps/applications/cmdutils/tee/tee.rc
index 949f1335d82..2ed9b99f99c 100644
--- a/rosapps/applications/cmdutils/tee/tee.rc
+++ b/rosapps/applications/cmdutils/tee/tee.rc
@@ -1,4 +1,3 @@
-/* $Id: tee.rc 18066 2005-09-25 19:38:46Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 tee command\0"
 #define REACTOS_STR_INTERNAL_NAME	"tee\0"
diff --git a/rosapps/applications/cmdutils/touch/touch.rc b/rosapps/applications/cmdutils/touch/touch.rc
index a2368954127..d4e19216cd0 100644
--- a/rosapps/applications/cmdutils/touch/touch.rc
+++ b/rosapps/applications/cmdutils/touch/touch.rc
@@ -1,4 +1,3 @@
-/* $Id: touch.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Touch utility\0"
 #define REACTOS_STR_INTERNAL_NAME	"touch\0"
diff --git a/rosapps/applications/cmdutils/y/y.rc b/rosapps/applications/cmdutils/y/y.rc
index 75f701a964c..d6d2c456e0c 100644
--- a/rosapps/applications/cmdutils/y/y.rc
+++ b/rosapps/applications/cmdutils/y/y.rc
@@ -1,4 +1,3 @@
-/* $Id: y.rc 18066 2005-09-25 19:38:46Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 y command\0"
 #define REACTOS_STR_INTERNAL_NAME	"y\0"
diff --git a/rosapps/applications/devutils/gdb2/gdb2.cpp b/rosapps/applications/devutils/gdb2/gdb2.cpp
index 73738faf3de..e6cee05358f 100644
--- a/rosapps/applications/devutils/gdb2/gdb2.cpp
+++ b/rosapps/applications/devutils/gdb2/gdb2.cpp
@@ -1,5 +1,4 @@
-/* $Id: gdb2.cpp 42968 2009-08-30 15:35:14Z sginsberg $
- *
+/*
  * gdb2 - gdb output splitter
  *
  * Copyright (C) 2000,2001 Nedko Arnaoudov <nedkohome@atia.com>
diff --git a/rosapps/applications/devutils/genguid/genguid.rc b/rosapps/applications/devutils/genguid/genguid.rc
index d50dc5bbd6e..c27773ca379 100644
--- a/rosapps/applications/devutils/genguid/genguid.rc
+++ b/rosapps/applications/devutils/genguid/genguid.rc
@@ -1,4 +1,3 @@
-/* $Id: genguid.rc 29689 2007-10-19 23:05:02Z dreimer $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"GUID Generator\0"
 #define REACTOS_STR_INTERNAL_NAME	"genguid\0"
diff --git a/rosapps/applications/net/dhcpd/dhcpd.rc b/rosapps/applications/net/dhcpd/dhcpd.rc
index ee0106ca19c..b7058f50b6f 100644
--- a/rosapps/applications/net/dhcpd/dhcpd.rc
+++ b/rosapps/applications/net/dhcpd/dhcpd.rc
@@ -1,4 +1,3 @@
-/* $Id: dhcpd.rc 21499 2006-04-07 10:16:12Z tretiakov $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"DHCP server service\0"
 #define REACTOS_STR_INTERNAL_NAME	"dhcpd\0"
diff --git a/rosapps/applications/net/dhcpd/mkinstalldirs b/rosapps/applications/net/dhcpd/mkinstalldirs
index 3f0eb1de1d1..5e17cd39fb7 100644
--- a/rosapps/applications/net/dhcpd/mkinstalldirs
+++ b/rosapps/applications/net/dhcpd/mkinstalldirs
@@ -4,8 +4,6 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs 21499 2006-04-07 10:16:12Z tretiakov $
-
 errstatus=0
 
 for file
diff --git a/rosapps/applications/net/ncftp/ncftp.rc b/rosapps/applications/net/ncftp/ncftp.rc
index ea762f5e23e..026d1733115 100644
--- a/rosapps/applications/net/ncftp/ncftp.rc
+++ b/rosapps/applications/net/ncftp/ncftp.rc
@@ -1,4 +1,3 @@
-/* $Id: ncftp.rc 29689 2007-10-19 23:05:02Z dreimer $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"Ncftp for Win32\0"
 #define REACTOS_STR_INTERNAL_NAME	"ncftp\0"
diff --git a/rosapps/applications/net/ncftp/ncftp/getline.c b/rosapps/applications/net/ncftp/ncftp/getline.c
index fc1fa8b8eae..c4cc0e3a60c 100644
--- a/rosapps/applications/net/ncftp/ncftp/getline.c
+++ b/rosapps/applications/net/ncftp/ncftp/getline.c
@@ -1,6 +1,3 @@
-/* Based on: "$Id: getline.c 44107 2009-11-11 18:19:42Z fireball $"; */
-static const char copyright[] = "getline:  Copyright (C) 1991, 1992, 1993, Chris Thewalt";
-
 /*
  * Copyright (C) 1991, 1992, 1993 by Chris Thewalt (thewalt@ce.berkeley.edu)
  *
@@ -21,6 +18,8 @@ static const char copyright[] = "getline:  Copyright (C) 1991, 1992, 1993, Chris
  * Note:  This version has been updated by Mike Gleason <mgleason@ncftp.com>
  */
 
+static const char copyright[] = "getline:  Copyright (C) 1991, 1992, 1993, Chris Thewalt";
+
 #if defined(WIN32) || defined(_WINDOWS)
 #	include <windows.h>
 #	include <sys/types.h>
diff --git a/rosapps/applications/net/netreg/netreg.rc b/rosapps/applications/net/netreg/netreg.rc
index 81f82f79fdf..5b657305159 100644
--- a/rosapps/applications/net/netreg/netreg.rc
+++ b/rosapps/applications/net/netreg/netreg.rc
@@ -1,4 +1,3 @@
-/* $Id: niclist.rc 11299 2004-10-16 22:30:19Z gvg $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS HTTP Registry Browser\0"
 #define REACTOS_STR_INTERNAL_NAME	"netreg\0"
diff --git a/rosapps/applications/net/niclist/niclist.c b/rosapps/applications/net/niclist/niclist.c
index 6d731b2282a..d4eec53cb46 100644
--- a/rosapps/applications/net/niclist/niclist.c
+++ b/rosapps/applications/net/niclist/niclist.c
@@ -1,5 +1,4 @@
-/* $Id: niclist.c 17609 2005-09-02 21:13:10Z hpoussin $
- *
+/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS packet driver interface list utility
  * FILE:        apps/net/niclist/niclist.c
diff --git a/rosapps/applications/net/niclist/niclist.rc b/rosapps/applications/net/niclist/niclist.rc
index c0d898c865f..7a5ed532f5c 100644
--- a/rosapps/applications/net/niclist/niclist.rc
+++ b/rosapps/applications/net/niclist/niclist.rc
@@ -1,4 +1,3 @@
-/* $Id: niclist.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS packet driver niclist\0"
 #define REACTOS_STR_INTERNAL_NAME	"niclist\0"
diff --git a/rosapps/applications/net/roshttpd/common/roshttpd.rc b/rosapps/applications/net/roshttpd/common/roshttpd.rc
index 29e0657fc8d..0b29ee1d69e 100644
--- a/rosapps/applications/net/roshttpd/common/roshttpd.rc
+++ b/rosapps/applications/net/roshttpd/common/roshttpd.rc
@@ -1,4 +1,3 @@
-/* $Id: roshttpd.rc 21491 2006-04-07 10:10:34Z tretiakov $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS HTTP Win32 Server\0"
 #define REACTOS_STR_INTERNAL_NAME	"roshttpd\0"
diff --git a/rosapps/applications/net/tditest/tditest.rc b/rosapps/applications/net/tditest/tditest.rc
index 051792effe3..6ce7f76def0 100644
--- a/rosapps/applications/net/tditest/tditest.rc
+++ b/rosapps/applications/net/tditest/tditest.rc
@@ -1,4 +1,3 @@
-/* $Id: tditest.rc 21844 2006-05-07 19:34:23Z ion $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"TDI test driver\0"
diff --git a/rosapps/applications/notevil/notevil.c b/rosapps/applications/notevil/notevil.c
index d1c58f571f9..0cd86bee188 100644
--- a/rosapps/applications/notevil/notevil.c
+++ b/rosapps/applications/notevil/notevil.c
@@ -1,5 +1,4 @@
-/* $Id: notevil.c 17609 2005-09-02 21:13:10Z hpoussin $
- *
+/*
  * notevil.c
  *
  * --------------------------------------------------------------------
diff --git a/rosapps/applications/notevil/notevil.rc b/rosapps/applications/notevil/notevil.rc
index ffa3e2e5323..ef07d1847dd 100644
--- a/rosapps/applications/notevil/notevil.rc
+++ b/rosapps/applications/notevil/notevil.rc
@@ -1,4 +1,3 @@
-/* $Id: notevil.rc 29689 2007-10-19 23:05:02Z dreimer $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Coders Console Parade\0"
 #define REACTOS_STR_INTERNAL_NAME	"notevil\0"
diff --git a/rosapps/applications/notevil/readme.txt b/rosapps/applications/notevil/readme.txt
index 6d5da996d89..2fcb417b86f 100644
--- a/rosapps/applications/notevil/readme.txt
+++ b/rosapps/applications/notevil/readme.txt
@@ -1,4 +1,3 @@
-$Id: readme.txt 34303 2008-07-05 11:46:22Z fireball $
 
 ReactOS Coders Console Parade
 -----------------------------
diff --git a/rosapps/applications/sysutils/chkdsk/chkdsk.c b/rosapps/applications/sysutils/chkdsk/chkdsk.c
index 06ae34038e4..c81a2045a11 100644
--- a/rosapps/applications/sysutils/chkdsk/chkdsk.c
+++ b/rosapps/applications/sysutils/chkdsk/chkdsk.c
@@ -1,7 +1,5 @@
 //======================================================================
 //
-// $Id: chkdsk.c 37749 2008-11-29 21:23:45Z sginsberg $
-//
 // Chkdskx
 //
 // Copyright (c) 1998 Mark Russinovich
diff --git a/rosapps/applications/sysutils/chkdsk/chkdsk.rc b/rosapps/applications/sysutils/chkdsk/chkdsk.rc
index 431fb393c44..d28775e6b83 100644
--- a/rosapps/applications/sysutils/chkdsk/chkdsk.rc
+++ b/rosapps/applications/sysutils/chkdsk/chkdsk.rc
@@ -1,4 +1,3 @@
-/* $Id: chkdsk.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Disk Checking Utility\0"
 #define REACTOS_STR_INTERNAL_NAME	"chkdsk\0"
diff --git a/rosapps/applications/sysutils/chklib/chklib.c b/rosapps/applications/sysutils/chklib/chklib.c
index 39dfdabe8f9..f5d25f4c7e5 100644
--- a/rosapps/applications/sysutils/chklib/chklib.c
+++ b/rosapps/applications/sysutils/chklib/chklib.c
@@ -1,5 +1,4 @@
-/* $Id: chklib.c 42932 2009-08-25 00:31:45Z gschneider $
- *
+/*
  * chklib.c
  *
  * Copyright (C) 1998, 1999 Emanuele Aliberti.
diff --git a/rosapps/applications/sysutils/chklib/chklib.rc b/rosapps/applications/sysutils/chklib/chklib.rc
index a7c8b775a33..6659e633a8b 100644
--- a/rosapps/applications/sysutils/chklib/chklib.rc
+++ b/rosapps/applications/sysutils/chklib/chklib.rc
@@ -1,4 +1,3 @@
-/* $Id: chklib.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"Tool to check a dynamic library for a symbol\0"
 #define REACTOS_STR_INTERNAL_NAME	"chklib\0"
diff --git a/rosapps/applications/sysutils/config.h b/rosapps/applications/sysutils/config.h
index e596c2dd14c..fe8bfaa5d9e 100644
--- a/rosapps/applications/sysutils/config.h
+++ b/rosapps/applications/sysutils/config.h
@@ -1,6 +1,6 @@
+
 #ifndef _INC_CONFIG_H
 #define _INC_CONFIG_H
-/* $Id: config.h 15091 2005-05-07 21:24:31Z sedwards $ */
 #define FMIFS_IMPORT_DLL
 #define REACTOS_NO_SECURITY_SS
 #endif /* ndef _INC_CONFIG_H */
diff --git a/rosapps/applications/sysutils/ctm/ctm.rc b/rosapps/applications/sysutils/ctm/ctm.rc
index 996a99208c3..a78a3c15d3b 100644
--- a/rosapps/applications/sysutils/ctm/ctm.rc
+++ b/rosapps/applications/sysutils/ctm/ctm.rc
@@ -1,4 +1,3 @@
-/* $Id: ctm.rc 35880 2008-09-02 14:00:30Z dreimer $ */
 
 #include <windows.h>
 #include "resource.h"
diff --git a/rosapps/applications/sysutils/kill/kill.rc b/rosapps/applications/sysutils/kill/kill.rc
index dae8bfffb34..44dc2eac886 100644
--- a/rosapps/applications/sysutils/kill/kill.rc
+++ b/rosapps/applications/sysutils/kill/kill.rc
@@ -1,4 +1,3 @@
-/* $Id: $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS W32 Kill Process Utility\0"
 #define REACTOS_STR_INTERNAL_NAME	"kill\0"
diff --git a/rosapps/applications/sysutils/logevent/logevent.c b/rosapps/applications/sysutils/logevent/logevent.c
index 3651a206338..a3231069afe 100644
--- a/rosapps/applications/sysutils/logevent/logevent.c
+++ b/rosapps/applications/sysutils/logevent/logevent.c
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: hostname.c 21664 2006-04-19 20:14:03Z gedmurphy $
- *
+/*
  * COPYRIGHT : See COPYING in the top level directory
  * PROJECT   : Event Logging Utility
  * FILE      : logevent.c
diff --git a/rosapps/applications/sysutils/lsdd/lsdd.c b/rosapps/applications/sysutils/lsdd/lsdd.c
index 2acf5664c0d..91e0aa37519 100644
--- a/rosapps/applications/sysutils/lsdd/lsdd.c
+++ b/rosapps/applications/sysutils/lsdd/lsdd.c
@@ -1,5 +1,4 @@
-/* $Id: lsdd.c 37749 2008-11-29 21:23:45Z sginsberg $
- *
+/*
  * FILE  : lsdd.c
  * AUTHOR: Emanuele ALIBERTI
  * DATE  : 2000-08-04
diff --git a/rosapps/applications/sysutils/lsdd/lsdd.rc b/rosapps/applications/sysutils/lsdd/lsdd.rc
index 25f53548a29..f9b84138f7e 100644
--- a/rosapps/applications/sysutils/lsdd/lsdd.rc
+++ b/rosapps/applications/sysutils/lsdd/lsdd.rc
@@ -1,4 +1,3 @@
-/* $Id: lsdd.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"Tool to list the device names visible to the W32 subsystem (also known as DOS Devices).\0"
 #define REACTOS_STR_INTERNAL_NAME	"lsdd\0"
diff --git a/rosapps/applications/sysutils/mkdosfs/getopt.c b/rosapps/applications/sysutils/mkdosfs/getopt.c
index 0783623e9cb..11b0d98dda9 100644
--- a/rosapps/applications/sysutils/mkdosfs/getopt.c
+++ b/rosapps/applications/sysutils/mkdosfs/getopt.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * This is an unpublished work copyright (c) 1998 HELIOS Software GmbH
  * 30827 Garbsen, Germany
  */
diff --git a/rosapps/applications/sysutils/pedump/pedump.c b/rosapps/applications/sysutils/pedump/pedump.c
index 1aa9a9606b1..88706cf0c8b 100644
--- a/rosapps/applications/sysutils/pedump/pedump.c
+++ b/rosapps/applications/sysutils/pedump/pedump.c
@@ -1,4 +1,3 @@
-// $Id: pedump.c 54033 2011-10-06 20:45:06Z pschweitzer $
 //
 // This program was written by Sang Cho, assistant professor at
 //                                       the department of
diff --git a/rosapps/applications/sysutils/pedump/pedump.rc b/rosapps/applications/sysutils/pedump/pedump.rc
index 8d07de6f61c..371a9d9f2cf 100644
--- a/rosapps/applications/sysutils/pedump/pedump.rc
+++ b/rosapps/applications/sysutils/pedump/pedump.rc
@@ -1,4 +1,3 @@
-/* $Id: pedump.rc 16861 2005-07-29 13:46:03Z ea $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"Tool to dump a PE image file.\0"
 #define REACTOS_STR_INTERNAL_NAME	"pedump\0"
diff --git a/rosapps/applications/sysutils/regexpl/ArgumentParser.cpp b/rosapps/applications/sysutils/regexpl/ArgumentParser.cpp
index a2e4aac3111..c472f9dfcc7 100644
--- a/rosapps/applications/sysutils/regexpl/ArgumentParser.cpp
+++ b/rosapps/applications/sysutils/regexpl/ArgumentParser.cpp
@@ -1,5 +1,4 @@
-/* $Id: ArgumentParser.cpp 12803 2005-01-04 21:40:25Z narnaoud $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ArgumentParser.h b/rosapps/applications/sysutils/regexpl/ArgumentParser.h
index 3f28994b584..97ea5472212 100644
--- a/rosapps/applications/sysutils/regexpl/ArgumentParser.h
+++ b/rosapps/applications/sysutils/regexpl/ArgumentParser.h
@@ -1,5 +1,4 @@
-/* $Id: ArgumentParser.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ArgumentParser.h: interface for the CArgumentParser class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/Completion.cpp b/rosapps/applications/sysutils/regexpl/Completion.cpp
index 6bcabc81770..8d0e388d54f 100644
--- a/rosapps/applications/sysutils/regexpl/Completion.cpp
+++ b/rosapps/applications/sysutils/regexpl/Completion.cpp
@@ -1,5 +1,4 @@
-/* $Id: Completion.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/Completion.h b/rosapps/applications/sysutils/regexpl/Completion.h
index 583dc9931b4..8df3026591e 100644
--- a/rosapps/applications/sysutils/regexpl/Completion.h
+++ b/rosapps/applications/sysutils/regexpl/Completion.h
@@ -1,5 +1,4 @@
-/* $Id: Completion.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // Completion.h - declaration for completion related functions
 
 #if !defined(COMLPETION_H__INCLUDED_)
diff --git a/rosapps/applications/sysutils/regexpl/Console.cpp b/rosapps/applications/sysutils/regexpl/Console.cpp
index f6d1a6cbe15..0f61aa0d50d 100644
--- a/rosapps/applications/sysutils/regexpl/Console.cpp
+++ b/rosapps/applications/sysutils/regexpl/Console.cpp
@@ -1,5 +1,4 @@
-/* $Id: Console.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/Console.h b/rosapps/applications/sysutils/regexpl/Console.h
index 09671071421..44cd5123159 100644
--- a/rosapps/applications/sysutils/regexpl/Console.h
+++ b/rosapps/applications/sysutils/regexpl/Console.h
@@ -1,5 +1,4 @@
-/* $Id: Console.h 42968 2009-08-30 15:35:14Z sginsberg $ */
-
+//
 // Console.h: interface for the CConsole class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/Pattern.cpp b/rosapps/applications/sysutils/regexpl/Pattern.cpp
index 361b927e043..55d4d300e96 100644
--- a/rosapps/applications/sysutils/regexpl/Pattern.cpp
+++ b/rosapps/applications/sysutils/regexpl/Pattern.cpp
@@ -1,5 +1,4 @@
-/* $Id: Pattern.cpp 29689 2007-10-19 23:05:02Z dreimer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/Pattern.h b/rosapps/applications/sysutils/regexpl/Pattern.h
index 6093593585a..11ab87f590f 100644
--- a/rosapps/applications/sysutils/regexpl/Pattern.h
+++ b/rosapps/applications/sysutils/regexpl/Pattern.h
@@ -1,5 +1,4 @@
-/* $Id: Pattern.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // Pattern.h: decalration for pattern functions
 
 #if !defined(PATTERN_H__INCLUDED_)
diff --git a/rosapps/applications/sysutils/regexpl/Prompt.cpp b/rosapps/applications/sysutils/regexpl/Prompt.cpp
index 6404dc479fd..6a9a56955e9 100644
--- a/rosapps/applications/sysutils/regexpl/Prompt.cpp
+++ b/rosapps/applications/sysutils/regexpl/Prompt.cpp
@@ -1,5 +1,4 @@
-/* $Id: Prompt.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/README b/rosapps/applications/sysutils/regexpl/README
index 93ebe0f76bd..40a22214e84 100644
--- a/rosapps/applications/sysutils/regexpl/README
+++ b/rosapps/applications/sysutils/regexpl/README
@@ -1,5 +1,3 @@
--*- Mode: Text -*-
-$Id: README 34303 2008-07-05 11:46:22Z fireball $
 
 Registry Explorer is console mode tool for reading/writing ReactOS
 registry. Currently, access is provided only by means of interactive
diff --git a/rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp b/rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp
index b5fcf812f22..83b1cbca1e2 100644
--- a/rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp
+++ b/rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp
@@ -1,5 +1,4 @@
-/* $Id: RegistryExplorer.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/RegistryExplorer.h b/rosapps/applications/sysutils/regexpl/RegistryExplorer.h
index 7969c40bec0..446d9f0985c 100644
--- a/rosapps/applications/sysutils/regexpl/RegistryExplorer.h
+++ b/rosapps/applications/sysutils/regexpl/RegistryExplorer.h
@@ -1,4 +1,3 @@
-/* $Id: RegistryExplorer.h 12802 2005-01-04 21:36:26Z narnaoud $ */
 
 #ifndef _REGISTRY_EXPLORER_H__INCLUDED
 #define _REGISTRY_EXPLORER_H__INCLUDED
diff --git a/rosapps/applications/sysutils/regexpl/RegistryKey.cpp b/rosapps/applications/sysutils/regexpl/RegistryKey.cpp
index 7a86ad42ec6..d3d6ec83483 100644
--- a/rosapps/applications/sysutils/regexpl/RegistryKey.cpp
+++ b/rosapps/applications/sysutils/regexpl/RegistryKey.cpp
@@ -1,5 +1,4 @@
-/* $Id: RegistryKey.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/RegistryKey.h b/rosapps/applications/sysutils/regexpl/RegistryKey.h
index 219479a44bd..6244c7671cc 100644
--- a/rosapps/applications/sysutils/regexpl/RegistryKey.h
+++ b/rosapps/applications/sysutils/regexpl/RegistryKey.h
@@ -1,5 +1,4 @@
-/* $Id: RegistryKey.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // RegistryKey.h: interface for the CRegistryKey class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/RegistryTree.cpp b/rosapps/applications/sysutils/regexpl/RegistryTree.cpp
index 2dff0b61f16..694e59a72ff 100644
--- a/rosapps/applications/sysutils/regexpl/RegistryTree.cpp
+++ b/rosapps/applications/sysutils/regexpl/RegistryTree.cpp
@@ -1,5 +1,4 @@
-/* $Id: RegistryTree.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/RegistryTree.h b/rosapps/applications/sysutils/regexpl/RegistryTree.h
index 2051ee9087f..72beed77d79 100644
--- a/rosapps/applications/sysutils/regexpl/RegistryTree.h
+++ b/rosapps/applications/sysutils/regexpl/RegistryTree.h
@@ -1,5 +1,4 @@
-/* $Id: RegistryTree.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // RegistryTree.h: interface for the CRegistryTree class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/SecurityDescriptor.cpp b/rosapps/applications/sysutils/regexpl/SecurityDescriptor.cpp
index 6319c81defd..9f55314359f 100644
--- a/rosapps/applications/sysutils/regexpl/SecurityDescriptor.cpp
+++ b/rosapps/applications/sysutils/regexpl/SecurityDescriptor.cpp
@@ -1,5 +1,4 @@
-/* $Id: SecurityDescriptor.cpp 12813 2005-01-05 02:21:05Z narnaoud $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/SecurityDescriptor.h b/rosapps/applications/sysutils/regexpl/SecurityDescriptor.h
index dcc01d5fe8c..72b934ed3ba 100644
--- a/rosapps/applications/sysutils/regexpl/SecurityDescriptor.h
+++ b/rosapps/applications/sysutils/regexpl/SecurityDescriptor.h
@@ -1,5 +1,4 @@
-/* $Id: SecurityDescriptor.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // SecurityDescriptor.h: interface for the CSecurityDescriptor class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/Settings.cpp b/rosapps/applications/sysutils/regexpl/Settings.cpp
index 259cac084f2..e3129b341ec 100644
--- a/rosapps/applications/sysutils/regexpl/Settings.cpp
+++ b/rosapps/applications/sysutils/regexpl/Settings.cpp
@@ -1,5 +1,4 @@
-/* $Id: Settings.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/Settings.h b/rosapps/applications/sysutils/regexpl/Settings.h
index d1a077348a5..e029ac45f3c 100644
--- a/rosapps/applications/sysutils/regexpl/Settings.h
+++ b/rosapps/applications/sysutils/regexpl/Settings.h
@@ -1,4 +1,3 @@
-/* $Id: Settings.h 15091 2005-05-07 21:24:31Z sedwards $ */
 
 #ifndef OPTIONS_H__a7382d2d_96b4_4472_974d_801281bd5327___INCLUDED
 #define OPTIONS_H__a7382d2d_96b4_4472_974d_801281bd5327___INCLUDED
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommand.cpp b/rosapps/applications/sysutils/regexpl/ShellCommand.cpp
index fec114ac95d..eff5311a141 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommand.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommand.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommand.cpp 12803 2005-01-04 21:40:25Z narnaoud $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommand.h b/rosapps/applications/sysutils/regexpl/ShellCommand.h
index 7757518bed7..2eb836d7aed 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommand.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommand.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommand.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommand.h: interface for the CShellCommand class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.cpp
index a42333677b1..aedefc440f4 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandChangeKey.cpp 29689 2007-10-19 23:05:02Z dreimer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.h b/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.h
index fa589de8b99..f6ffb9d55e1 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandChangeKey.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandChangeKey.h: interface for the CShellCommandChangeKey class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandConnect.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandConnect.cpp
index 1af0d2e2ad7..a331c3c192d 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandConnect.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandConnect.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandConnect.cpp 29689 2007-10-19 23:05:02Z dreimer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandConnect.h b/rosapps/applications/sysutils/regexpl/ShellCommandConnect.h
index 60205a17f23..7eb6265b93e 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandConnect.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandConnect.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandConnect.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandConnect.h: interface for the CShellCommandConnect class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp
index 4b011ff3ac3..d0c6e9f220a 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDACL.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDACL.h b/rosapps/applications/sysutils/regexpl/ShellCommandDACL.h
index 82cb14256d2..5dd1441e7b0 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDACL.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDACL.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDACL.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandDACL.h: interface for the CShellCommandDACL class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.cpp
index 93269411362..b589fc7d00d 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDOKA.cpp 12803 2005-01-04 21:40:25Z narnaoud $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.h b/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.h
index 1360eefcf5f..0efeecb8ca2 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDOKA.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandDOKA.h: interface for the CShellCommandDOKA class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.cpp
index e2d91ff2b6d..0583af8337d 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDeleteKey.cpp 29689 2007-10-19 23:05:02Z dreimer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.h b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.h
index dc9a1818905..498932b3486 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDeleteKey.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandDeleteKey.h: interface for the CShellCommandDeleteKey class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp
index 5ab2d52d357..1da0ef7e60c 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDeleteValue.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.h b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.h
index caf75bc3114..3c14a372825 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDeleteValue.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandDeleteValue.h: interface for the CShellCommandDeleteValue class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp
index 194bf690557..85a63d4cc13 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDir.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandDir.h b/rosapps/applications/sysutils/regexpl/ShellCommandDir.h
index 76ae4b5fe70..e74532b935d 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandDir.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandDir.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandDir.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandDir.h: interface for the CShellCommandDir class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandExit.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandExit.cpp
index 6ea49306d47..211d08d7a5c 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandExit.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandExit.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandExit.cpp 12803 2005-01-04 21:40:25Z narnaoud $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandExit.h b/rosapps/applications/sysutils/regexpl/ShellCommandExit.h
index 619e89b3ec1..85fa6c2a21d 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandExit.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandExit.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandExit.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandExit.h: interface for the CShellCommandExit class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandHelp.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandHelp.cpp
index 1f9ff9ade0f..519fdec0988 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandHelp.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandHelp.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandHelp.cpp 12803 2005-01-04 21:40:25Z narnaoud $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandHelp.h b/rosapps/applications/sysutils/regexpl/ShellCommandHelp.h
index ba138949cd8..1afe38977f3 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandHelp.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandHelp.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandHelp.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandHelp.h: interface for the CShellCommandHelp class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.cpp
index 11e1ebe73c2..1bd313d3fb6 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandNewKey.cpp 29689 2007-10-19 23:05:02Z dreimer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.h b/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.h
index a7b26b706b9..f94e67fc72c 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandNewKey.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandNewKey.h: interface for the CShellCommandNewKey class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp
index 1850a60ff12..ef9a55557a8 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandOwner.cpp 38906 2009-01-18 18:40:02Z sginsberg $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandOwner.h b/rosapps/applications/sysutils/regexpl/ShellCommandOwner.h
index ce7204d23a3..9268ee0f1c1 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandOwner.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandOwner.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandOwner.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandOwner.h: interface for the CShellCommandOwner class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp
index fd0da7c02d9..cf6eb11a267 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandSACL.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandSACL.h b/rosapps/applications/sysutils/regexpl/ShellCommandSACL.h
index 637ea3660a5..bcc8536135c 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandSACL.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandSACL.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandSACL.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandSACL.h: interface for the CShellCommandSACL class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp
index 3650440b53c..b0dfaea2b49 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandSetValue.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.h b/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.h
index 957c166bbd9..060293b81a4 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandSetValue.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandSetValue.h: interface for the CShellCommandSetValue class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp
index 1fab0055a20..7db957414e2 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandValue.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandValue.h b/rosapps/applications/sysutils/regexpl/ShellCommandValue.h
index c62ca5242eb..d0c70a0b7a4 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandValue.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandValue.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandValue.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandValue.h: interface for the CShellCommandValue class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandVersion.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandVersion.cpp
index dea1e8b94c0..2944242707a 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandVersion.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandVersion.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandVersion.cpp 12803 2005-01-04 21:40:25Z narnaoud $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandVersion.h b/rosapps/applications/sysutils/regexpl/ShellCommandVersion.h
index 68827f076ca..1a92dd603b5 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandVersion.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandVersion.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandVersion.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandVersion.h: interface for the CShellCommandVersion class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.cpp
index 70d06ccba7d..07435eba4d6 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.cpp
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.cpp
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandsLinkedList.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.h b/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.h
index 2937e4f6410..f85d54586fd 100644
--- a/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.h
+++ b/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.h
@@ -1,5 +1,4 @@
-/* $Id: ShellCommandsLinkedList.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // ShellCommandsLinkedList.h: interface for the CShellCommandsLinkedList class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/TextHistory.cpp b/rosapps/applications/sysutils/regexpl/TextHistory.cpp
index a6162580229..6e2cb2d1ad2 100644
--- a/rosapps/applications/sysutils/regexpl/TextHistory.cpp
+++ b/rosapps/applications/sysutils/regexpl/TextHistory.cpp
@@ -1,5 +1,4 @@
-/* $Id: TextHistory.cpp 54034 2011-10-06 21:36:10Z pschweitzer $
- *
+/*
  * regexpl - Console Registry Explorer
  *
  * Copyright (C) 2000-2005 Nedko Arnaudov <nedko@users.sourceforge.net>
diff --git a/rosapps/applications/sysutils/regexpl/TextHistory.h b/rosapps/applications/sysutils/regexpl/TextHistory.h
index 9d3fe26a4ce..5c3d7936e77 100644
--- a/rosapps/applications/sysutils/regexpl/TextHistory.h
+++ b/rosapps/applications/sysutils/regexpl/TextHistory.h
@@ -1,5 +1,4 @@
-/* $Id: TextHistory.h 15091 2005-05-07 21:24:31Z sedwards $ */
-
+//
 // TextHistory.h: interface for the CTextHistory class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/rosapps/applications/sysutils/regexpl/ph.h b/rosapps/applications/sysutils/regexpl/ph.h
index a926ae71edb..5c3732a52bb 100644
--- a/rosapps/applications/sysutils/regexpl/ph.h
+++ b/rosapps/applications/sysutils/regexpl/ph.h
@@ -1,5 +1,4 @@
-/* $Id: ph.h 54378 2011-11-14 22:14:52Z jimtabor $ */
-
+//
 // ph.h : include file for standard system include files,
 //  or project specific include files that are used frequently, but
 //      are changed infrequently
diff --git a/rosapps/applications/sysutils/regexpl/regexpl.rc b/rosapps/applications/sysutils/regexpl/regexpl.rc
index 5af5933a15a..ebfbfa83266 100644
--- a/rosapps/applications/sysutils/regexpl/regexpl.rc
+++ b/rosapps/applications/sysutils/regexpl/regexpl.rc
@@ -1,4 +1,3 @@
-/* $Id: regexpl.rc 12803 2005-01-04 21:40:25Z narnaoud $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Console Registry Explorer\0"
 #define REACTOS_STR_INTERNAL_NAME	"regexpl\0"
diff --git a/rosapps/applications/sysutils/tlist/tlist.rc b/rosapps/applications/sysutils/tlist/tlist.rc
index e7ab799091d..b69688cf5fa 100644
--- a/rosapps/applications/sysutils/tlist/tlist.rc
+++ b/rosapps/applications/sysutils/tlist/tlist.rc
@@ -1,4 +1,3 @@
-/* $Id: tlist.rc 29689 2007-10-19 23:05:02Z dreimer $ */
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS W32 T(ask)List\0"
 #define REACTOS_STR_INTERNAL_NAME	"tlist\0"
diff --git a/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.c b/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.c
index ca9c6cd4634..1a5343a93be 100644
--- a/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.c
+++ b/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.c
@@ -1,5 +1,4 @@
-/* $Id: nts2w32err.c 24501 2006-10-13 10:56:52Z janderwald $
- *
+/*
  * Convert NTSTATUS codes to Win32 error codes: run it
  * on a NT box AND on a ROS box, then diff the results.
  *
diff --git a/rosapps/applications/sysutils/utils/objdir/objdir.c b/rosapps/applications/sysutils/utils/objdir/objdir.c
index d78b1ae7703..cd6c099fc29 100644
--- a/rosapps/applications/sysutils/utils/objdir/objdir.c
+++ b/rosapps/applications/sysutils/utils/objdir/objdir.c
@@ -1,5 +1,4 @@
-/* $Id: objdir.c 37749 2008-11-29 21:23:45Z sginsberg $
- *
+/*
  * DESCRIPTION: Object Manager Simple Explorer
  * PROGRAMMER:  David Welch
  * REVISIONS
diff --git a/rosapps/applications/sysutils/utils/pice/module/pice.rc b/rosapps/applications/sysutils/utils/pice/module/pice.rc
index 7bdca960f4c..bdf4b166f82 100644
--- a/rosapps/applications/sysutils/utils/pice/module/pice.rc
+++ b/rosapps/applications/sysutils/utils/pice/module/pice.rc
@@ -1,4 +1,3 @@
-/* $Id: pice.rc 21687 2006-04-21 16:36:34Z tretiakov $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"PICE Debugger\0"
diff --git a/rosapps/applications/sysutils/utils/ps/ps.c.toolhelp b/rosapps/applications/sysutils/utils/ps/ps.c.toolhelp
index cdc6b7476aa..46192cad142 100644
--- a/rosapps/applications/sysutils/utils/ps/ps.c.toolhelp
+++ b/rosapps/applications/sysutils/utils/ps/ps.c.toolhelp
@@ -1,5 +1,4 @@
-/* $Id: ps.c.toolhelp 21303 2006-03-12 00:41:06Z jimtabor $
- *
+/*
  *  ReactOS ps - process list console viewer
  *
  *  ps.c
diff --git a/rosapps/applications/sysutils/utils/sdkparse/test.h b/rosapps/applications/sysutils/utils/sdkparse/test.h
index e71062c5d46..5b20f27d3a2 100644
--- a/rosapps/applications/sysutils/utils/sdkparse/test.h
+++ b/rosapps/applications/sysutils/utils/sdkparse/test.h
@@ -1,5 +1,3 @@
-/* $Id: test.h 22385 2006-06-17 16:45:48Z gedmurphy $
-*/
 /*
  * test.h
  *
diff --git a/rosapps/applications/sysutils/utils/tickcount/tickcount.c b/rosapps/applications/sysutils/utils/tickcount/tickcount.c
index 7c56a141a48..2f7e2cc9d31 100644
--- a/rosapps/applications/sysutils/utils/tickcount/tickcount.c
+++ b/rosapps/applications/sysutils/utils/tickcount/tickcount.c
@@ -1,5 +1,3 @@
-/* $Id: tickcount.c 22417 2006-06-19 13:55:51Z gedmurphy $
-*/
 /*
  tickcount -- Display the kernel tick count (or any tick count passed as an
  argument or as input) in human-readable format
diff --git a/rosapps/applications/sysutils/win32err.h b/rosapps/applications/sysutils/win32err.h
index eb13191c99f..38455c786f8 100644
--- a/rosapps/applications/sysutils/win32err.h
+++ b/rosapps/applications/sysutils/win32err.h
@@ -1,6 +1,6 @@
 #ifndef _INC_WIN32ERR_H
 #define _INC_WIN32ERR_H
-/* $Id: win32err.h 14516 2005-04-05 19:19:44Z sedwards $ */
+
 VOID
 PrintWin32Error(
 	PWCHAR	Message,
diff --git a/rosapps/applications/sysutils/wmain.c b/rosapps/applications/sysutils/wmain.c
index 0fd1af97898..2bc7bb26bd8 100644
--- a/rosapps/applications/sysutils/wmain.c
+++ b/rosapps/applications/sysutils/wmain.c
@@ -1,5 +1,4 @@
-/* $Id: wmain.c 15091 2005-05-07 21:24:31Z sedwards $
- *
+/*
  * Entry point for programs that use wmain()
  */
 #include <stdio.h>
diff --git a/rosapps/demos/maze/Makefile b/rosapps/demos/maze/Makefile
index 3d33c473931..ade1431fcd6 100644
--- a/rosapps/demos/maze/Makefile
+++ b/rosapps/demos/maze/Makefile
@@ -1,4 +1,3 @@
-# $Id: Makefile 43236 2009-09-30 13:32:05Z sginsberg $
 
 PATH_TO_TOP = ../../../reactos
 
diff --git a/rosapps/lib/win32err/win32err.c b/rosapps/lib/win32err/win32err.c
index ff3d8227f25..c68a20f3582 100644
--- a/rosapps/lib/win32err/win32err.c
+++ b/rosapps/lib/win32err/win32err.c
@@ -1,5 +1,4 @@
-/* $Id: win32err.c 16861 2005-07-29 13:46:03Z ea $
- *
+/*
  * win32err.c
  *
  * Copyright (c) 1998 Mark Russinovich
diff --git a/rosapps/templates/mdi/mdi.rc b/rosapps/templates/mdi/mdi.rc
index 63c862c2763..8a598cf7889 100644
--- a/rosapps/templates/mdi/mdi.rc
+++ b/rosapps/templates/mdi/mdi.rc
@@ -1,4 +1,3 @@
-/* $Id: mdi.rc 31932 2008-01-21 21:29:59Z dreimer $ */
 
 #include <windows.h>
 
diff --git a/rosapps/templates/template/template.c b/rosapps/templates/template/template.c
index 5789e109df6..75fbf7fbc13 100644
--- a/rosapps/templates/template/template.c
+++ b/rosapps/templates/template/template.c
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: template.c 37749 2008-11-29 21:23:45Z sginsberg $
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             services/fs/template/template.c