diff --git a/reactos/win32ss/drivers/font/ftfd/rosglue.c b/reactos/win32ss/drivers/font/ftfd/rosglue.c
index 6a8c025a230..5917521ab67 100644
--- a/reactos/win32ss/drivers/font/ftfd/rosglue.c
+++ b/reactos/win32ss/drivers/font/ftfd/rosglue.c
@@ -1,5 +1,4 @@
-/* $Id: rosglue.c 39928 2009-03-10 02:49:45Z tkreuzer $
- *
+/*
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           FreeType implementation for ReactOS
  * PURPOSE:           Glue functions between FreeType
diff --git a/reactos/win32ss/gdi/gdi32/misc/hacks.c b/reactos/win32ss/gdi/gdi32/misc/hacks.c
index 51e46be49b9..c8ac9987164 100644
--- a/reactos/win32ss/gdi/gdi32/misc/hacks.c
+++ b/reactos/win32ss/gdi/gdi32/misc/hacks.c
@@ -1,12 +1,11 @@
 #include "precomp.h"
 
-/* $Id: stubs.c 28709 2007-08-31 15:09:51Z greatlrd $
- *
+/*
  * reactos/lib/gdi32/misc/hacks.c
  *
  * GDI32.DLL hacks
  *
- * Api that are hacked but we can not do correct implemtions yetm but using own syscall
+ * Apis that are hacked but we cannot write correct implementations yet but we are using our own syscall
  *
  */
 
diff --git a/reactos/win32ss/gdi/gdi32/misc/heap.c b/reactos/win32ss/gdi/gdi32/misc/heap.c
index 83c47473d47..64b4207cfb6 100644
--- a/reactos/win32ss/gdi/gdi32/misc/heap.c
+++ b/reactos/win32ss/gdi/gdi32/misc/heap.c
@@ -15,7 +15,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 /*
- * $Id:
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS GDI32
  * PURPOSE:
diff --git a/reactos/win32ss/gdi/gdi32/misc/historic.c b/reactos/win32ss/gdi/gdi32/misc/historic.c
index c144069ecee..689aecb61f8 100644
--- a/reactos/win32ss/gdi/gdi32/misc/historic.c
+++ b/reactos/win32ss/gdi/gdi32/misc/historic.c
@@ -1,10 +1,9 @@
-/* $Id: stubs.c 28709 2007-08-31 15:09:51Z greatlrd $
- *
+/*
  * reactos/lib/gdi32/misc/historic.c
  *
  * GDI32.DLL Stubs
  *
- * Api that does basic nothing, but is here for backwords compatible with older windows
+ * Apis that do basically nothing, but are here for backwards compatibility with older Windows
  *
  */
 
diff --git a/reactos/win32ss/gdi/gdi32/objects/eng.c b/reactos/win32ss/gdi/gdi32/objects/eng.c
index e13f84c3e3e..b8d3d8e8e8f 100644
--- a/reactos/win32ss/gdi/gdi32/objects/eng.c
+++ b/reactos/win32ss/gdi/gdi32/objects/eng.c
@@ -1,5 +1,4 @@
-/* $Id: stubs.c 28533 2007-08-24 22:44:36Z greatlrd $
- *
+/*
  * reactos/lib/gdi32/misc/eng.c
  *
  * GDI32.DLL eng part
diff --git a/reactos/win32ss/gdi/gdi32/objects/path.c b/reactos/win32ss/gdi/gdi32/objects/path.c
index db08f05e8c4..50ed87fc93f 100644
--- a/reactos/win32ss/gdi/gdi32/objects/path.c
+++ b/reactos/win32ss/gdi/gdi32/objects/path.c
@@ -1,5 +1,4 @@
-/* $Id: stubs.c 18897 2005-12-08 23:10:33Z cwittich $
- *
+/*
  * reactos/lib/gdi32/objects/path.c
  *
  * GDI32.DLL Path
diff --git a/reactos/win32ss/reactx/dxg/dxg.rc b/reactos/win32ss/reactx/dxg/dxg.rc
index 9418600f0ba..28671e2b73d 100644
--- a/reactos/win32ss/reactx/dxg/dxg.rc
+++ b/reactos/win32ss/reactx/dxg/dxg.rc
@@ -1,4 +1,3 @@
-/* $Id: vbemp.rc 21844 2006-05-07 19:34:23Z ion $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"DXG DirectX interface Device Driver\0"
diff --git a/reactos/win32ss/reactx/dxgthk/dxgthk.rc b/reactos/win32ss/reactx/dxgthk/dxgthk.rc
index 5f88c536cfa..1c3c816396c 100644
--- a/reactos/win32ss/reactx/dxgthk/dxgthk.rc
+++ b/reactos/win32ss/reactx/dxgthk/dxgthk.rc
@@ -1,4 +1,3 @@
-/* $Id: vbemp.rc 21844 2006-05-07 19:34:23Z ion $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"DirectX Graphics Driver Thunk\0"
diff --git a/reactos/win32ss/user/ntuser/csr.h b/reactos/win32ss/user/ntuser/csr.h
index 0541b6eed73..5256c03b651 100644
--- a/reactos/win32ss/user/ntuser/csr.h
+++ b/reactos/win32ss/user/ntuser/csr.h
@@ -1,5 +1,4 @@
-/* $Id: csr.h 56311 2012-04-01 20:42:43Z akhaldi $
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Interface to csrss
diff --git a/reactos/win32ss/user/ntuser/vis.h b/reactos/win32ss/user/ntuser/vis.h
index 71cb1aa1c48..93e27b50963 100644
--- a/reactos/win32ss/user/ntuser/vis.h
+++ b/reactos/win32ss/user/ntuser/vis.h
@@ -1,5 +1,4 @@
-/* $Id: vis.h 56311 2012-04-01 20:42:43Z akhaldi $
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS Win32k subsystem
  * PURPOSE:          Visibility computations interface definition
diff --git a/reactos/win32ss/user/user32/include/regcontrol.h b/reactos/win32ss/user/user32/include/regcontrol.h
index 97832b26d07..91a9892520c 100644
--- a/reactos/win32ss/user/user32/include/regcontrol.h
+++ b/reactos/win32ss/user/user32/include/regcontrol.h
@@ -1,5 +1,4 @@
-/* $Id: regcontrol.h 50357 2011-01-11 18:47:16Z gadamopoulos $
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS User32
  * PURPOSE:          Built-in control registration
diff --git a/reactos/win32ss/user/user32/misc/desktop.c b/reactos/win32ss/user/user32/misc/desktop.c
index 8eecc10ce48..da21a5efd3e 100644
--- a/reactos/win32ss/user/user32/misc/desktop.c
+++ b/reactos/win32ss/user/user32/misc/desktop.c
@@ -1,5 +1,4 @@
-/* $Id: desktop.c 57236 2012-09-04 05:37:13Z jimtabor $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/desktop.c
diff --git a/reactos/win32ss/user/user32/misc/object.c b/reactos/win32ss/user/user32/misc/object.c
index d86a0750e38..d85e6768d45 100644
--- a/reactos/win32ss/user/user32/misc/object.c
+++ b/reactos/win32ss/user/user32/misc/object.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: object.c 57652 2012-10-30 16:50:11Z gadamopoulos $
- *
+/*
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/dde.c
  * PURPOSE:         DDE
diff --git a/reactos/win32ss/user/user32/misc/timer.c b/reactos/win32ss/user/user32/misc/timer.c
index 7ea609b6e02..a3303c146c8 100644
--- a/reactos/win32ss/user/user32/misc/timer.c
+++ b/reactos/win32ss/user/user32/misc/timer.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: timer.c 53436 2011-08-25 08:51:26Z gadamopoulos $
- *
+/*
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/dde.c
  * PURPOSE:         DDE
diff --git a/reactos/win32ss/user/user32/misc/winsta.c b/reactos/win32ss/user/user32/misc/winsta.c
index e4f6c82a5b9..ad7768d921a 100644
--- a/reactos/win32ss/user/user32/misc/winsta.c
+++ b/reactos/win32ss/user/user32/misc/winsta.c
@@ -1,5 +1,4 @@
-/* $Id: winsta.c 51082 2011-03-17 13:19:18Z gadamopoulos $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/winsta.c
diff --git a/reactos/win32ss/user/user32/windows/accel.c b/reactos/win32ss/user/user32/windows/accel.c
index 435abb084bc..40db647e99a 100644
--- a/reactos/win32ss/user/user32/windows/accel.c
+++ b/reactos/win32ss/user/user32/windows/accel.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: accel.c 53436 2011-08-25 08:51:26Z gadamopoulos $
- *
+/*
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
  * PURPOSE:         Accelerator tables
diff --git a/reactos/win32ss/user/user32/windows/caret.c b/reactos/win32ss/user/user32/windows/caret.c
index 06b55e56872..6b3b16cfc58 100644
--- a/reactos/win32ss/user/user32/windows/caret.c
+++ b/reactos/win32ss/user/user32/windows/caret.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: caret.c 54199 2011-10-19 16:17:32Z rharabien $
- *
+/*
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/caret.c
  * PURPOSE:         Caret
diff --git a/reactos/win32ss/user/user32/windows/clipboard.c b/reactos/win32ss/user/user32/windows/clipboard.c
index 14604152038..fe321a8f5ee 100644
--- a/reactos/win32ss/user/user32/windows/clipboard.c
+++ b/reactos/win32ss/user/user32/windows/clipboard.c
@@ -1,5 +1,4 @@
-/* $Id: clipboard.c 53657 2011-09-09 15:24:14Z rharabien $
- *
+/*
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/clipboard.c
  * PURPOSE:         Input
diff --git a/reactos/win32ss/user/user32/windows/dc.c b/reactos/win32ss/user/user32/windows/dc.c
index 37d12284880..6ade68f2984 100644
--- a/reactos/win32ss/user/user32/windows/dc.c
+++ b/reactos/win32ss/user/user32/windows/dc.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: dc.c 53436 2011-08-25 08:51:26Z gadamopoulos $
- *
+/*
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
  * PURPOSE:         Input
diff --git a/reactos/win32ss/user/user32/windows/font.c b/reactos/win32ss/user/user32/windows/font.c
index 0e7a1b58527..a6f00eb8b10 100644
--- a/reactos/win32ss/user/user32/windows/font.c
+++ b/reactos/win32ss/user/user32/windows/font.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: font.c 48387 2010-07-31 22:36:22Z fireball $
- *
+/*
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
  * PURPOSE:         Input
diff --git a/reactos/win32ss/user/user32/windows/rect.c b/reactos/win32ss/user/user32/windows/rect.c
index f6547645c78..451407c3eb6 100644
--- a/reactos/win32ss/user/user32/windows/rect.c
+++ b/reactos/win32ss/user/user32/windows/rect.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: rect.c 37763 2008-11-30 11:42:05Z sginsberg $
- *
+/*
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
  * PURPOSE:         Input
diff --git a/reactos/win32ss/user/user32/windows/text.c b/reactos/win32ss/user/user32/windows/text.c
index dfb645b3839..a6770b42cc6 100644
--- a/reactos/win32ss/user/user32/windows/text.c
+++ b/reactos/win32ss/user/user32/windows/text.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: text.c 37776 2008-11-30 19:28:11Z hyperion $
- *
+/*
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/windows/input.c
  * PURPOSE:         Input
diff --git a/reactos/win32ss/user/win32csr/alias.c b/reactos/win32ss/user/win32csr/alias.c
index 55c69966627..3329d84e355 100644
--- a/reactos/win32ss/user/win32csr/alias.c
+++ b/reactos/win32ss/user/win32csr/alias.c
@@ -1,4 +1,4 @@
-/* $Id: init.c 31400 2007-12-22 17:18:32Z fireball $
+/*
  * PROJECT:     ReactOS CSRSS
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        subsystems/win32/csrss/api/alias.c
diff --git a/reactos/win32ss/user/win32csr/conio.h b/reactos/win32ss/user/win32csr/conio.h
index 7a35d7647d1..6f1b81a0b2e 100644
--- a/reactos/win32ss/user/win32csr/conio.h
+++ b/reactos/win32ss/user/win32csr/conio.h
@@ -1,5 +1,4 @@
-/* $Id: conio.h 55617 2012-02-15 20:29:08Z ion $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            subsys/csrss/include/conio.h
diff --git a/reactos/win32ss/user/win32csr/desktopbg.h b/reactos/win32ss/user/win32csr/desktopbg.h
index 006ac2102b1..84d3859eef3 100644
--- a/reactos/win32ss/user/win32csr/desktopbg.h
+++ b/reactos/win32ss/user/win32csr/desktopbg.h
@@ -1,5 +1,4 @@
-/* $Id: desktopbg.h 47315 2010-05-23 00:51:29Z jmorlan $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            subsys/csrss/include/destkopbg.h
diff --git a/reactos/win32ss/user/win32csr/exitros.c b/reactos/win32ss/user/win32csr/exitros.c
index 0e24d56a171..e8ac3f24098 100644
--- a/reactos/win32ss/user/win32csr/exitros.c
+++ b/reactos/win32ss/user/win32csr/exitros.c
@@ -1,5 +1,4 @@
-/* $Id: exitros.c 58411 2013-03-02 22:22:56Z gadamopoulos $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS CSRSS subsystem
  * FILE:            subsys/csrss/win32csr/exitros.c
diff --git a/reactos/win32ss/user/win32csr/guiconsole.c b/reactos/win32ss/user/win32csr/guiconsole.c
index af978bb4f99..1db2047ccbe 100644
--- a/reactos/win32ss/user/win32csr/guiconsole.c
+++ b/reactos/win32ss/user/win32csr/guiconsole.c
@@ -1,5 +1,4 @@
-/* $Id: guiconsole.c 57326 2012-09-18 21:45:00Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            subsys/csrss/win32csr/guiconsole.c
diff --git a/reactos/win32ss/user/win32csr/guiconsole.h b/reactos/win32ss/user/win32csr/guiconsole.h
index 94220f1f01d..d715883c089 100644
--- a/reactos/win32ss/user/win32csr/guiconsole.h
+++ b/reactos/win32ss/user/win32csr/guiconsole.h
@@ -1,5 +1,4 @@
-/* $Id: guiconsole.h 57326 2012-09-18 21:45:00Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            subsys/csrss/win32csr/guiconsole.h
diff --git a/reactos/win32ss/user/win32csr/handle.c b/reactos/win32ss/user/win32csr/handle.c
index f8b004ecc7e..33a654cfa63 100644
--- a/reactos/win32ss/user/win32csr/handle.c
+++ b/reactos/win32ss/user/win32csr/handle.c
@@ -1,5 +1,4 @@
-/* $Id: handle.c 56955 2012-07-23 20:25:11Z tfaber $
- *
+/*
  * reactos/subsys/csrss/api/handle.c
  *
  * CSRSS handle functions
diff --git a/reactos/win32ss/user/win32csr/resource.h b/reactos/win32ss/user/win32csr/resource.h
index 4f505bc68ee..1a210f4413f 100644
--- a/reactos/win32ss/user/win32csr/resource.h
+++ b/reactos/win32ss/user/win32csr/resource.h
@@ -1,5 +1,4 @@
-/* $Id: resource.h 51293 2011-04-09 12:01:36Z mkupfer $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Win32 subsystem
  * FILE:            subsys/csrss/win32csr/resource.h
diff --git a/reactos/win32ss/user/win32csr/tuiconsole.c b/reactos/win32ss/user/win32csr/tuiconsole.c
index 5f773a47204..ceb7ba8e0db 100644
--- a/reactos/win32ss/user/win32csr/tuiconsole.c
+++ b/reactos/win32ss/user/win32csr/tuiconsole.c
@@ -1,5 +1,4 @@
-/* $Id: tuiconsole.c 47693 2010-06-08 06:38:14Z jmorlan $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            subsys/csrss/win32csr/tuiconsole.c
diff --git a/reactos/win32ss/user/win32csr/tuiconsole.h b/reactos/win32ss/user/win32csr/tuiconsole.h
index 9a2cedf0ca9..c4012bd8107 100644
--- a/reactos/win32ss/user/win32csr/tuiconsole.h
+++ b/reactos/win32ss/user/win32csr/tuiconsole.h
@@ -1,5 +1,4 @@
-/* $Id: tuiconsole.h 21947 2006-05-20 10:49:56Z fireball $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            subsys/csrss/win32csr/tuiconsole.h
diff --git a/reactos/win32ss/user/win32csr/win32csr.h b/reactos/win32ss/user/win32csr/win32csr.h
index 6ee85dc2b27..9e68a0d46b6 100644
--- a/reactos/win32ss/user/win32csr/win32csr.h
+++ b/reactos/win32ss/user/win32csr/win32csr.h
@@ -1,5 +1,4 @@
-/* $Id: win32csr.h 58214 2013-01-24 23:00:42Z akhaldi $
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            subsys/csrss/win32csr/win32csr.h
diff --git a/reactos/win32ss/user/winsrv/dllmain.c b/reactos/win32ss/user/winsrv/dllmain.c
index 5f790bdff77..c31ac89b1b6 100644
--- a/reactos/win32ss/user/winsrv/dllmain.c
+++ b/reactos/win32ss/user/winsrv/dllmain.c
@@ -1,5 +1,4 @@
-/* $Id: dllmain.c 43790 2009-10-27 10:34:16Z dgorbachev $
- *
+/*
  * dllmain.c - ReactOS/Win32 Console+User Enviroment Subsystem Server
  *
  * ReactOS Operating System
diff --git a/reactos/win32ss/user/winsrv/init.c b/reactos/win32ss/user/winsrv/init.c
index 6a284f446bd..0be57ffd664 100644
--- a/reactos/win32ss/user/winsrv/init.c
+++ b/reactos/win32ss/user/winsrv/init.c
@@ -1,5 +1,4 @@
-/* $Id: init.c 43790 2009-10-27 10:34:16Z dgorbachev $
- *
+/*
  * init.c - ReactOS/Win32 Console+User Enviroment Subsystem Server - Initialization
  * 
  * ReactOS Operating System
diff --git a/reactos/win32ss/user/winsrv/server.c b/reactos/win32ss/user/winsrv/server.c
index 22b768e17e5..f3cf32ed825 100644
--- a/reactos/win32ss/user/winsrv/server.c
+++ b/reactos/win32ss/user/winsrv/server.c
@@ -1,5 +1,4 @@
-/* $Id: server.c 43790 2009-10-27 10:34:16Z dgorbachev $
- *
+/*
  * server.c - ReactOS/Win32 Console+User Enviroment Subsystem Server - Initialization
  *
  * ReactOS Operating System
diff --git a/reactos/win32ss/user/winsrv/winsrv.def b/reactos/win32ss/user/winsrv/winsrv.def
index 4c002090d73..6283e2d10b0 100644
--- a/reactos/win32ss/user/winsrv/winsrv.def
+++ b/reactos/win32ss/user/winsrv/winsrv.def
@@ -1,4 +1,4 @@
-; $Id: winsrv.def 21947 2006-05-20 10:49:56Z fireball $
+
 LIBRARY winsrv.dll
 EXPORTS
 ConServerDllInitialization@8
diff --git a/reactos/win32ss/win32k.rc b/reactos/win32ss/win32k.rc
index 090dca89fcb..476b8d28dcc 100644
--- a/reactos/win32ss/win32k.rc
+++ b/reactos/win32ss/win32k.rc
@@ -1,4 +1,3 @@
-/* $Id: win32k.rc 56311 2012-04-01 20:42:43Z akhaldi $ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 GDI KM subsystem\0"