From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Tue, 10 Nov 2015 17:41:55 +0000 (+0000)
Subject: [WIN32SS] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE... 
X-Git-Tag: ReactOS-0.4.0~187
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=9f8c4e262897a57c45289098b3e04f683e59d93a

[WIN32SS] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114

svn path=/trunk/; revision=69871
---

diff --git a/reactos/win32ss/gdi/dib/alphablend.c b/reactos/win32ss/gdi/dib/alphablend.c
index bf3e5ce5cc6..6e856213892 100644
--- a/reactos/win32ss/gdi/dib/alphablend.c
+++ b/reactos/win32ss/gdi/dib/alphablend.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         Win32 subsystem
  * LICENSE:         See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/dib/stretchblt.c
+ * FILE:            win32ss/gdi/dib/alphablend.c
  * PURPOSE:         AlphaBlend implementation suitable for all bit depths
  * PROGRAMMERS:     Jérôme Gardou
  */
diff --git a/reactos/win32ss/gdi/dib/dib.c b/reactos/win32ss/gdi/dib/dib.c
index 21a91078cf6..46740b4ec6f 100644
--- a/reactos/win32ss/gdi/dib/dib.c
+++ b/reactos/win32ss/gdi/dib/dib.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         Win32 subsystem
  * LICENSE:         See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/dib/dib.c
+ * FILE:            win32ss/gdi/dib/dib.c
  * PURPOSE:         ROP handling, function pointer arrays, misc
  * PROGRAMMERS:     Ge van Geldorp
  */
diff --git a/reactos/win32ss/gdi/dib/dib16bpp.c b/reactos/win32ss/gdi/dib/dib16bpp.c
index 1fd539cb4aa..6ce4568293b 100644
--- a/reactos/win32ss/gdi/dib/dib16bpp.c
+++ b/reactos/win32ss/gdi/dib/dib16bpp.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         Win32 subsystem
  * LICENSE:         See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/dib/dib16bpp.c
+ * FILE:            win32ss/gdi/dib/dib16bpp.c
  * PURPOSE:         Device Independant Bitmap functions, 16bpp
  * PROGRAMMERS:     Jason Filby
  *                  Thomas Bluemel
diff --git a/reactos/win32ss/gdi/dib/dib1bpp.c b/reactos/win32ss/gdi/dib/dib1bpp.c
index a7dc4a36e67..e5dc0fda639 100644
--- a/reactos/win32ss/gdi/dib/dib1bpp.c
+++ b/reactos/win32ss/gdi/dib/dib1bpp.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         Win32 subsystem
  * LICENSE:         See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/dib/dib1bpp.c
+ * FILE:            win32ss/gdi/dib/dib1bpp.c
  * PURPOSE:         Device Independant Bitmap functions, 1bpp
  * PROGRAMMERS:     Jason Filby
  */
diff --git a/reactos/win32ss/gdi/dib/dib24bpp.c b/reactos/win32ss/gdi/dib/dib24bpp.c
index 7dedceb855a..0974842b503 100644
--- a/reactos/win32ss/gdi/dib/dib24bpp.c
+++ b/reactos/win32ss/gdi/dib/dib24bpp.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         Win32 subsystem
  * LICENSE:         See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/dib/dib24bpp.c
+ * FILE:            win32ss/gdi/dib/dib24bpp.c
  * PURPOSE:         Device Independant Bitmap functions, 24bpp
  * PROGRAMMERS:     Jason Filby
  *                  Thomas Bluemel
diff --git a/reactos/win32ss/gdi/dib/dib24bppc.c b/reactos/win32ss/gdi/dib/dib24bppc.c
index ca09cee518b..80fed45a132 100644
--- a/reactos/win32ss/gdi/dib/dib24bppc.c
+++ b/reactos/win32ss/gdi/dib/dib24bppc.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         Win32 subsystem
  * LICENSE:         See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/dib/dib24bppc.c
+ * FILE:            win32ss/gdi/dib/dib24bppc.c
  * PURPOSE:         C language equivalents of asm optimised 24bpp functions
  * PROGRAMMERS:     Jason Filby
  *                  Magnus Olsen
diff --git a/reactos/win32ss/gdi/dib/dib32bpp.c b/reactos/win32ss/gdi/dib/dib32bpp.c
index 191391d5892..7c1af5a121c 100644
--- a/reactos/win32ss/gdi/dib/dib32bpp.c
+++ b/reactos/win32ss/gdi/dib/dib32bpp.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         Win32 subsystem
  * LICENSE:         See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/dib/dib32bpp.c
+ * FILE:            win32ss/gdi/dib/dib32bpp.c
  * PURPOSE:         Device Independant Bitmap functions, 32bpp
  * PROGRAMMERS:     Jason Filby
  *                  Thomas Bluemel
diff --git a/reactos/win32ss/gdi/dib/dib32bppc.c b/reactos/win32ss/gdi/dib/dib32bppc.c
index 859e9507e0e..fb1c0dc38d6 100644
--- a/reactos/win32ss/gdi/dib/dib32bppc.c
+++ b/reactos/win32ss/gdi/dib/dib32bppc.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         Win32 subsystem
  * LICENSE:         See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/dib/dib32bppc.c
+ * FILE:            win32ss/gdi/dib/dib32bppc.c
  * PURPOSE:         C language equivalents of asm optimised 32bpp functions
  * PROGRAMMERS:     Jason Filby
  *                  Magnus Olsen
diff --git a/reactos/win32ss/gdi/dib/dib4bpp.c b/reactos/win32ss/gdi/dib/dib4bpp.c
index 1b6f0f1ce82..56c03e50658 100644
--- a/reactos/win32ss/gdi/dib/dib4bpp.c
+++ b/reactos/win32ss/gdi/dib/dib4bpp.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         Win32 subsystem
  * LICENSE:         See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/dib/dib4bpp.c
+ * FILE:            win32ss/gdi/dib/dib4bpp.c
  * PURPOSE:         Device Independant Bitmap functions, 4bpp
  * PROGRAMMERS:     Jason Filby
  */
diff --git a/reactos/win32ss/gdi/dib/dib8bpp.c b/reactos/win32ss/gdi/dib/dib8bpp.c
index a3c6ed07c69..c30d738b67b 100644
--- a/reactos/win32ss/gdi/dib/dib8bpp.c
+++ b/reactos/win32ss/gdi/dib/dib8bpp.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         Win32 subsystem
  * LICENSE:         See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/dib/dib8bpp.c
+ * FILE:            win32ss/gdi/dib/dib8bpp.c
  * PURPOSE:         Device Independant Bitmap functions, 8bpp
  * PROGRAMMERS:     Jason Filby
  *                  Thomas Bluemel
diff --git a/reactos/win32ss/gdi/dib/dib_new.c b/reactos/win32ss/gdi/dib/dib_new.c
index 92f49b48e0c..918c7a4d866 100644
--- a/reactos/win32ss/gdi/dib/dib_new.c
+++ b/reactos/win32ss/gdi/dib/dib_new.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         Win32 subsystem
  * LICENSE:         See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/dib/dib.c
+ * FILE:            win32ss/gdi/dib/dib_new.c
  * PURPOSE:         ROP handling, function pointer arrays, misc
  * PROGRAMMERS:     Ge van Geldorp
  */
diff --git a/reactos/win32ss/gdi/dib/floodfill.c b/reactos/win32ss/gdi/dib/floodfill.c
index 13a0fed00e3..012f27a8f9e 100644
--- a/reactos/win32ss/gdi/dib/floodfill.c
+++ b/reactos/win32ss/gdi/dib/floodfill.c
@@ -2,7 +2,7 @@
 * COPYRIGHT:         See COPYING in the top level directory
 * PROJECT:           ReactOS win32 subsystem
 * PURPOSE:           Flood filling support
-* FILE:              subsystems/win32/win32k/dib/floodfill.c
+* FILE:              win32ss/gdi/dib/floodfill.c
 * PROGRAMMER:        Gregor Schneider, <grschneider AT gmail DOT com>
 */
 
diff --git a/reactos/win32ss/gdi/dib/i386/dib24bpp_hline.s b/reactos/win32ss/gdi/dib/i386/dib24bpp_hline.s
index 1d36aa4bb9c..96baabb2eb0 100644
--- a/reactos/win32ss/gdi/dib/i386/dib24bpp_hline.s
+++ b/reactos/win32ss/gdi/dib/i386/dib24bpp_hline.s
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         Win32 subsystem
  * LICENSE:         See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/dib/i386/dib24bpp_hline.c
+ * FILE:            win32ss/gdi/dib/i386/dib24bpp_hline.s
  * PURPOSE:         ASM optimised 24bpp HLine
  * PROGRAMMERS:     Magnus Olsen
  */
diff --git a/reactos/win32ss/gdi/dib/i386/dib32bpp_colorfill.s b/reactos/win32ss/gdi/dib/i386/dib32bpp_colorfill.s
index 39743a596c4..ebc0418a7e5 100644
--- a/reactos/win32ss/gdi/dib/i386/dib32bpp_colorfill.s
+++ b/reactos/win32ss/gdi/dib/i386/dib32bpp_colorfill.s
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         Win32 subsystem
  * LICENSE:         See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.c
+ * FILE:            win32ss/gdi/dib/i386/dib32bpp_colorfill.s
  * PURPOSE:         ASM optimised 32bpp ColorFill
  * PROGRAMMERS:     Magnus Olsen
  *                  Timo Kreuzer (timo.kreuzer@reactos.org)
diff --git a/reactos/win32ss/gdi/dib/i386/dib32bpp_hline.s b/reactos/win32ss/gdi/dib/i386/dib32bpp_hline.s
index c60d43d6343..bb501905d96 100644
--- a/reactos/win32ss/gdi/dib/i386/dib32bpp_hline.s
+++ b/reactos/win32ss/gdi/dib/i386/dib32bpp_hline.s
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         Win32 subsystem
  * LICENSE:         See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/dib/i386/dib32bpp_hline.c
+ * FILE:            win32ss/gdi/dib/i386/dib32bpp_hline.s
  * PURPOSE:         ASM optimised 32bpp HLine
  * PROGRAMMERS:     Magnus Olsen
  */
diff --git a/reactos/win32ss/gdi/dib/stretchblt.c b/reactos/win32ss/gdi/dib/stretchblt.c
index 55f80575942..cbcdad2f88c 100644
--- a/reactos/win32ss/gdi/dib/stretchblt.c
+++ b/reactos/win32ss/gdi/dib/stretchblt.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS Win32k subsystem
  * LICENSE:         See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/dib/stretchblt.c
+ * FILE:            win32ss/gdi/dib/stretchblt.c
  * PURPOSE:         StretchBlt implementation suitable for all bit depths
  * PROGRAMMERS:     Magnus Olsen
  *                  Evgeniy Boltik
diff --git a/reactos/win32ss/gdi/eng/alphablend.c b/reactos/win32ss/gdi/eng/alphablend.c
index be039ad0bbd..f9bbf6db731 100644
--- a/reactos/win32ss/gdi/eng/alphablend.c
+++ b/reactos/win32ss/gdi/eng/alphablend.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          GDI alpha blending functions
- * FILE:             subsystems/win32/win32k/eng/alphablend.c
+ * FILE:             win32ss/gdi/eng/alphablend.c
  * PROGRAMER:        Jason Filby
  */
 
diff --git a/reactos/win32ss/gdi/eng/bitblt.c b/reactos/win32ss/gdi/eng/bitblt.c
index a1c002a567e..bd1512fe9e6 100644
--- a/reactos/win32ss/gdi/eng/bitblt.c
+++ b/reactos/win32ss/gdi/eng/bitblt.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS Win32k subsystem
  * PURPOSE:          GDI BitBlt Functions
- * FILE:             subsystems/win32/win32k/eng/bitblt.c
+ * FILE:             win32ss/gdi/eng/bitblt.c
  * PROGRAMER:        Jason Filby
  *                   Timo Kreuzer
  */
diff --git a/reactos/win32ss/gdi/eng/clip.c b/reactos/win32ss/gdi/eng/clip.c
index d3c0bb1c573..3aa8ded08dc 100644
--- a/reactos/win32ss/gdi/eng/clip.c
+++ b/reactos/win32ss/gdi/eng/clip.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           GDI Clipping Functions
- * FILE:              subsystems/win32/win32k/eng/clip.c
+ * FILE:              win32ss/gdi/eng/clip.c
  * PROGRAMER:         Jason Filby
  */
 
diff --git a/reactos/win32ss/gdi/eng/copybits.c b/reactos/win32ss/gdi/eng/copybits.c
index 94013aac4da..0b8824392db 100644
--- a/reactos/win32ss/gdi/eng/copybits.c
+++ b/reactos/win32ss/gdi/eng/copybits.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          GDI EngCopyBits Function
- * FILE:             subsys/win32k/eng/copybits.c
+ * FILE:             win32ss/gdi/eng/copybits.c
  * PROGRAMER:        Jason Filby
  */
 
diff --git a/reactos/win32ss/gdi/eng/debug.c b/reactos/win32ss/gdi/eng/debug.c
index f2a136de8cc..e2caad535c4 100644
--- a/reactos/win32ss/gdi/eng/debug.c
+++ b/reactos/win32ss/gdi/eng/debug.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           
- * FILE:              subsys/win32k/eng/debug.c
+ * FILE:              win32ss/gdi/eng/debug.c
  * PROGRAMER:         Jason Filby
  */
 
diff --git a/reactos/win32ss/gdi/eng/device.c b/reactos/win32ss/gdi/eng/device.c
index 9852bc0a84e..e1d6363e5b0 100644
--- a/reactos/win32ss/gdi/eng/device.c
+++ b/reactos/win32ss/gdi/eng/device.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           GDI Driver Device Functions
- * FILE:              subsys/win32k/eng/device.c
+ * FILE:              win32ss/gdi/eng/device.c
  * PROGRAMER:         Jason Filby
  *                    Timo Kreuzer
  */
diff --git a/reactos/win32ss/gdi/eng/driverobj.c b/reactos/win32ss/gdi/eng/driverobj.c
index 5f1b96bfba2..f1987df6afa 100644
--- a/reactos/win32ss/gdi/eng/driverobj.c
+++ b/reactos/win32ss/gdi/eng/driverobj.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         GPL, see COPYING in the top level directory
  * PROJECT:           ReactOS win32 kernel mode sunsystem
  * PURPOSE:           GDI DRIVEROBJ Functions
- * FILE:              subsystems/win32k/eng/driverobj.c
+ * FILE:              win32ss/gdi/eng/driverobj.c
  * PROGRAMER:         Timo Kreuzer
  */
 
diff --git a/reactos/win32ss/gdi/eng/drvdbg.c b/reactos/win32ss/gdi/eng/drvdbg.c
index aba1ba68e70..d9bb9683fb7 100644
--- a/reactos/win32ss/gdi/eng/drvdbg.c
+++ b/reactos/win32ss/gdi/eng/drvdbg.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         Win32 subsystem
  * LICENSE:         GNU GPL, see COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/eng/ddidbg.c
+ * FILE:            win32ss/gdi/eng/drvdbg.c
  * PURPOSE:         Debug hooks for display driver callbacks
  * PROGRAMMERS:     Timo Kreuzer
  */
diff --git a/reactos/win32ss/gdi/eng/engbrush.c b/reactos/win32ss/gdi/eng/engbrush.c
index a078c057b21..4003b7a92c9 100644
--- a/reactos/win32ss/gdi/eng/engbrush.c
+++ b/reactos/win32ss/gdi/eng/engbrush.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           GDI Driver Brush Functions
- * FILE:              subsystem/win32/win32k/eng/engbrush.c
+ * FILE:              win32ss/gdi/eng/engbrush.c
  * PROGRAMER:         Jason Filby
  *                    Timo Kreuzer
  */
diff --git a/reactos/win32ss/gdi/eng/engevent.c b/reactos/win32ss/gdi/eng/engevent.c
index edc4620271b..d5c8c6c4f89 100644
--- a/reactos/win32ss/gdi/eng/engevent.c
+++ b/reactos/win32ss/gdi/eng/engevent.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS Win32K
  * LICENSE:         BSD - See COPYING.ARM in the top level directory
- * FILE:            subsystems/win32/win32k/eng/engevent.c
+ * FILE:            win32ss/gdi/eng/engevent.c
  * PURPOSE:         Event Support Routines
  * PROGRAMMERS:     Aleksey Bragin <aleksey@reactos.org>
  *                  ReactOS Portable Systems Group
diff --git a/reactos/win32ss/gdi/eng/engmisc.c b/reactos/win32ss/gdi/eng/engmisc.c
index 076aead1eca..73ef8744af7 100644
--- a/reactos/win32ss/gdi/eng/engmisc.c
+++ b/reactos/win32ss/gdi/eng/engmisc.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS Win32k subsystem
  * PURPOSE:           ENG misc Functions
- * FILE:              subsystems/win32/win32k/eng/engmisc.c
+ * FILE:              win32ss/gdi/eng/engmisc.c
  * PROGRAMER:         ReactOS Team
  */
 
diff --git a/reactos/win32ss/gdi/eng/engobjects.h b/reactos/win32ss/gdi/eng/engobjects.h
index 687a02d992b..a00cd332d8d 100644
--- a/reactos/win32ss/gdi/eng/engobjects.h
+++ b/reactos/win32ss/gdi/eng/engobjects.h
@@ -20,7 +20,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           GDI Internal Objects
- * FILE:              subsystem/win32/win32k/eng/objects.h
+ * FILE:              win32ss/gdi/eng/engobjects.h
  * PROGRAMER:         Jason Filby
  * REVISION HISTORY:
  *                 21/8/1999: Created
diff --git a/reactos/win32ss/gdi/eng/engwindow.c b/reactos/win32ss/gdi/eng/engwindow.c
index 3338076ea2e..42e30a4d976 100644
--- a/reactos/win32ss/gdi/eng/engwindow.c
+++ b/reactos/win32ss/gdi/eng/engwindow.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           GDI WNDOBJ Functions
- * FILE:              subsystems/win32/win32k/eng/engwindow.c
+ * FILE:              win32ss/gdi/eng/engwindow.c
  * PROGRAMER:         Gregor Anich
  */
 
diff --git a/reactos/win32ss/gdi/eng/float.c b/reactos/win32ss/gdi/eng/float.c
index 5ccbc0b6eac..69e5c519b7b 100644
--- a/reactos/win32ss/gdi/eng/float.c
+++ b/reactos/win32ss/gdi/eng/float.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           Engine floating point functions
- * FILE:              subsys/win32k/eng/float.c
+ * FILE:              win32ss/gdi/eng/float.c
  * PROGRAMER:         David Welch
  */
 
diff --git a/reactos/win32ss/gdi/eng/gradient.c b/reactos/win32ss/gdi/eng/gradient.c
index 626323b7ed3..4777abc7499 100644
--- a/reactos/win32ss/gdi/eng/gradient.c
+++ b/reactos/win32ss/gdi/eng/gradient.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           GDI Driver Gradient Functions
- * FILE:              subsys/win32k/eng/gradient.c
+ * FILE:              win32ss/gdi/eng/gradient.c
  * PROGRAMER:         Thomas Weidenmueller
  */
 
diff --git a/reactos/win32ss/gdi/eng/i386/floatobj.S b/reactos/win32ss/gdi/eng/i386/floatobj.S
index 60c479017e5..2f84a7358b2 100644
--- a/reactos/win32ss/gdi/eng/i386/floatobj.S
+++ b/reactos/win32ss/gdi/eng/i386/floatobj.S
@@ -2,7 +2,7 @@
  * COPYRIGHT:         LGPL, see LGPL.txt in the top level directory
  * PROJECT:           ReactOS Win32 subsystem
  * PURPOSE:           FLOATOBJ floating point emulation functions for x86
- * FILE:              subsystems/win32/win32k/objects/i386/floatobj.S
+ * FILE:              win32ss/gdi/eng/i386/floatobj.S
  * PROGRAMMER:        Timo Kreuzer
  */
 
diff --git a/reactos/win32ss/gdi/eng/ldevobj.c b/reactos/win32ss/gdi/eng/ldevobj.c
index ff7fea01501..5b354c79c5e 100644
--- a/reactos/win32ss/gdi/eng/ldevobj.c
+++ b/reactos/win32ss/gdi/eng/ldevobj.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS Win32k subsystem
  * PURPOSE:          Support for logical devices
- * FILE:             subsystems/win32/win32k/eng/ldevobj.c
+ * FILE:             win32ss/gdi/eng/ldevobj.c
  * PROGRAMER:        Timo Kreuzer (timo.kreuzer@reactos.org)
  */
 
diff --git a/reactos/win32ss/gdi/eng/lineto.c b/reactos/win32ss/gdi/eng/lineto.c
index c26ec9bbe62..e5ff302ac78 100644
--- a/reactos/win32ss/gdi/eng/lineto.c
+++ b/reactos/win32ss/gdi/eng/lineto.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Line functions
- * FILE:             subsystems/win32/win32k/eng/lineto.c
+ * FILE:             win32ss/gdi/eng/lineto.c
  * PROGRAMER:        ReactOS Team
  */
 
diff --git a/reactos/win32ss/gdi/eng/mapping.c b/reactos/win32ss/gdi/eng/mapping.c
index 299e8a793a7..0ca9de2dd9a 100644
--- a/reactos/win32ss/gdi/eng/mapping.c
+++ b/reactos/win32ss/gdi/eng/mapping.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           Functions for mapping files and sections
- * FILE:              subsys/win32k/eng/device.c
+ * FILE:              win32ss/gdi/eng/mapping.c
  * PROGRAMER:         Timo Kreuzer (timo.kreuzer@reactos.org)
  */
 
diff --git a/reactos/win32ss/gdi/eng/mem.c b/reactos/win32ss/gdi/eng/mem.c
index 79cd5b2d141..b6eba270510 100644
--- a/reactos/win32ss/gdi/eng/mem.c
+++ b/reactos/win32ss/gdi/eng/mem.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           GDI Driver Memory Management Functions
- * FILE:              subsys/win32k/eng/mem.c
+ * FILE:              win32ss/gdi/eng/mem.c
  * PROGRAMER:         Jason Filby
  */
 
diff --git a/reactos/win32ss/gdi/eng/mouse.c b/reactos/win32ss/gdi/eng/mouse.c
index ab673f1cc76..677a0e68eee 100644
--- a/reactos/win32ss/gdi/eng/mouse.c
+++ b/reactos/win32ss/gdi/eng/mouse.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS win32 subsystem
  * PURPOSE:          Mouse pointer functions
- * FILE:             subsystems/win32k/eng/mouse.c
+ * FILE:             win32ss/gdi/eng/mouse.c
  * PROGRAMER:        Casper S. Hornstrup (chorns@users.sourceforge.net)
  *                   Timo Kreuzer (timo.kreuzer@reactos.org)
  */
diff --git a/reactos/win32ss/gdi/eng/paint.c b/reactos/win32ss/gdi/eng/paint.c
index 97874489cfe..8c9a9922247 100644
--- a/reactos/win32ss/gdi/eng/paint.c
+++ b/reactos/win32ss/gdi/eng/paint.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           GDI Driver Paint Functions
- * FILE:              subsys/win32k/eng/paint.c
+ * FILE:              win32ss/gdi/eng/paint.c
  * PROGRAMERS:        Timo Kreuzer (timo.kreuzer@reactos.org)
  *                    Jason Filby
  */
diff --git a/reactos/win32ss/gdi/eng/pdevobj.c b/reactos/win32ss/gdi/eng/pdevobj.c
index 6645f1d6120..cc724715f50 100644
--- a/reactos/win32ss/gdi/eng/pdevobj.c
+++ b/reactos/win32ss/gdi/eng/pdevobj.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Support for physical devices
- * FILE:             subsystems/win32/win32k/eng/pdevobj.c
+ * FILE:             win32ss/gdi/eng/pdevobj.c
  * PROGRAMER:        Timo Kreuzer (timo.kreuzer@reactos.org)
  */
 
diff --git a/reactos/win32ss/gdi/eng/perfcnt.c b/reactos/win32ss/gdi/eng/perfcnt.c
index ddcd7bb6d66..8ed0511ec3d 100644
--- a/reactos/win32ss/gdi/eng/perfcnt.c
+++ b/reactos/win32ss/gdi/eng/perfcnt.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           GDI Driver Performance Counter Functions
- * FILE:              subsys/win32k/eng/perfcnt.c
+ * FILE:              win32ss/gdi/eng/perfcnt.c
  * PROGRAMER:         Ge van Geldorp
  */
 
diff --git a/reactos/win32ss/gdi/eng/rlecomp.c b/reactos/win32ss/gdi/eng/rlecomp.c
index 881b4dd8afc..ea90c4219bf 100644
--- a/reactos/win32ss/gdi/eng/rlecomp.c
+++ b/reactos/win32ss/gdi/eng/rlecomp.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           RLE compression
- * FILE:              subsystems/win32k/eng/rlecomp.c
+ * FILE:              win32ss/gdi/eng/rlecomp.c
  * PROGRAMER:         Jason Filby
  */
 
diff --git a/reactos/win32ss/gdi/eng/sort.c b/reactos/win32ss/gdi/eng/sort.c
index b1e25443012..e46ecfa7142 100644
--- a/reactos/win32ss/gdi/eng/sort.c
+++ b/reactos/win32ss/gdi/eng/sort.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:          ReactOS win32 subsystem
  * PURPOSE:
- * FILE:             subsystems/win32k/eng/sort.c
+ * FILE:             win32ss/gdi/eng/sort.c
  * PROGRAMER:        ReactOS Team
  */
 
diff --git a/reactos/win32ss/gdi/eng/stretchblt.c b/reactos/win32ss/gdi/eng/stretchblt.c
index a244c784284..da54ddc4964 100644
--- a/reactos/win32ss/gdi/eng/stretchblt.c
+++ b/reactos/win32ss/gdi/eng/stretchblt.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS Win32k subsystem
  * PURPOSE:          GDI stretch blt functions
- * FILE:             subsystems/win32/win32k/eng/stretchblt.c
+ * FILE:             win32ss/gdi/eng/stretchblt.c
  * PROGRAMER:        Jason Filby
  */
 
diff --git a/reactos/win32ss/gdi/eng/surface.c b/reactos/win32ss/gdi/eng/surface.c
index cbb2c5aec17..b2d288363a2 100644
--- a/reactos/win32ss/gdi/eng/surface.c
+++ b/reactos/win32ss/gdi/eng/surface.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           GDI Driver Surace Functions
- * FILE:              subsys/win32k/eng/surface.c
+ * FILE:              win32ss/gdi/eng/surface.c
  * PROGRAMERS:        Jason Filby
  *                    Timo Kreuzer
  * TESTING TO BE DONE:
diff --git a/reactos/win32ss/gdi/eng/transblt.c b/reactos/win32ss/gdi/eng/transblt.c
index a4eaaebc471..43708da5dbc 100644
--- a/reactos/win32ss/gdi/eng/transblt.c
+++ b/reactos/win32ss/gdi/eng/transblt.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          GDI TransparentBlt Function
- * FILE:             subsys/win32k/eng/transblt.c
+ * FILE:             win32ss/gdi/eng/transblt.c
  * PROGRAMER:        Thomas Weidenmueller (w3seek@users.sourceforge.net)
  */
 
diff --git a/reactos/win32ss/gdi/eng/xlateobj.c b/reactos/win32ss/gdi/eng/xlateobj.c
index fbca0255d8a..53d2cebc71f 100644
--- a/reactos/win32ss/gdi/eng/xlateobj.c
+++ b/reactos/win32ss/gdi/eng/xlateobj.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS Win32k subsystem
  * PURPOSE:          GDI Color Translation Functions
- * FILE:             subsystems/win32/win32k/eng/xlate.c
+ * FILE:             win32ss/gdi/eng/xlateobj.c
  * PROGRAMER:        Timo Kreuzer (timo.kreuzer@reactos.org)
  */
 
diff --git a/reactos/win32ss/gdi/eng/xlateobj.h b/reactos/win32ss/gdi/eng/xlateobj.h
index 7e338932e6f..50cd858816b 100644
--- a/reactos/win32ss/gdi/eng/xlateobj.h
+++ b/reactos/win32ss/gdi/eng/xlateobj.h
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           XLATEOBJ structures and functions
- * FILE:              subsystem/win32/win32k/eng/objects.h
+ * FILE:              win32ss/gdi/eng/xlateobj.h
  * PROGRAMER:         Timo Kreuzer
  *
  */
diff --git a/reactos/win32ss/gdi/ntgdi/coord.c b/reactos/win32ss/gdi/ntgdi/coord.c
index 004de465030..5841df055e6 100644
--- a/reactos/win32ss/gdi/ntgdi/coord.c
+++ b/reactos/win32ss/gdi/ntgdi/coord.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        GNU GPL, See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Coordinate systems
- * FILE:             subsystems/win32/win32k/objects/coord.c
+ * FILE:             win32ss/gdi/ntgdi/coord.c
  * PROGRAMER:        Timo Kreuzer (timo.kreuzer@rectos.org)
  */
 
diff --git a/reactos/win32ss/gdi/ntgdi/dcattr.c b/reactos/win32ss/gdi/ntgdi/dcattr.c
index 726fd0a86db..0624a7aabf8 100644
--- a/reactos/win32ss/gdi/ntgdi/dcattr.c
+++ b/reactos/win32ss/gdi/ntgdi/dcattr.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           Functions for creation and destruction of DCs
- * FILE:              subsystem/win32/win32k/objects/dcattr.c
+ * FILE:              win32ss/gdi/ntgdi/dcattr.c
  * PROGRAMER:         Timo Kreuzer (timo.kreuzer@rectos.org)
  */
 
diff --git a/reactos/win32ss/gdi/ntgdi/dclife.c b/reactos/win32ss/gdi/ntgdi/dclife.c
index 24ea0498e77..21e38e574ba 100644
--- a/reactos/win32ss/gdi/ntgdi/dclife.c
+++ b/reactos/win32ss/gdi/ntgdi/dclife.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           Functions for creation and destruction of DCs
- * FILE:              subsystem/win32/win32k/objects/dclife.c
+ * FILE:              win32ss/gdi/ntgdi/dclife.c
  * PROGRAMER:         Timo Kreuzer (timo.kreuzer@rectos.org)
  */
 
diff --git a/reactos/win32ss/gdi/ntgdi/dcobjs.c b/reactos/win32ss/gdi/ntgdi/dcobjs.c
index 1028822a9a3..a4c263c27fc 100644
--- a/reactos/win32ss/gdi/ntgdi/dcobjs.c
+++ b/reactos/win32ss/gdi/ntgdi/dcobjs.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS Win32k subsystem
  * PURPOSE:           Functions for creation and destruction of DCs
- * FILE:              subsystems/win32/win32k/objects/dcobjs.c
+ * FILE:              win32ss/gdi/ntgdi/dcobjs.c
  * PROGRAMER:         Timo Kreuzer (timo.kreuzer@rectos.org)
  */
 
diff --git a/reactos/win32ss/gdi/ntgdi/dcstate.c b/reactos/win32ss/gdi/ntgdi/dcstate.c
index 419753ede1b..5a18c658de6 100644
--- a/reactos/win32ss/gdi/ntgdi/dcstate.c
+++ b/reactos/win32ss/gdi/ntgdi/dcstate.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS Win32k subsystem
  * PURPOSE:           Functions for saving and restoring dc states
- * FILE:              subsystems/win32/win32k/objects/dcstate.c
+ * FILE:              win32ss/gdi/ntgdi/dcstate.c
  * PROGRAMER:         Timo Kreuzer (timo.kreuzer@rectos.org)
  */
 
diff --git a/reactos/win32ss/gdi/ntgdi/device.c b/reactos/win32ss/gdi/ntgdi/device.c
index 7f9bd44c36e..9b1ca91bcdb 100644
--- a/reactos/win32ss/gdi/ntgdi/device.c
+++ b/reactos/win32ss/gdi/ntgdi/device.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           Functions for creation and destruction of DCs
- * FILE:              subsystem/win32/win32k/objects/device.c
+ * FILE:              win32ss/gdi/ntgdi/device.c
  * PROGRAMER:         Timo Kreuzer (timo.kreuzer@rectos.org)
  */
 
diff --git a/reactos/win32ss/gdi/ntgdi/dibobj.c b/reactos/win32ss/gdi/ntgdi/dibobj.c
index 06671c5a5fa..5d0f98ed1e1 100644
--- a/reactos/win32ss/gdi/ntgdi/dibobj.c
+++ b/reactos/win32ss/gdi/ntgdi/dibobj.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS win32 kernel mode subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/objects/dibobj.c
+ * FILE:            win32ss/gdi/ntgdi/dibobj.c
  * PURPOSE:         Dib object functions
  * PROGRAMMER:
  */
diff --git a/reactos/win32ss/gdi/ntgdi/fillshap.c b/reactos/win32ss/gdi/ntgdi/fillshap.c
index 95f607ca882..db16f01ea86 100644
--- a/reactos/win32ss/gdi/ntgdi/fillshap.c
+++ b/reactos/win32ss/gdi/ntgdi/fillshap.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS win32 kernel mode subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/objects/fillshap.c
+ * FILE:            win32ss/gdi/ntgdi/fillshap.c
  * PURPOSE:         fillshap
  * PROGRAMMER:
  */
diff --git a/reactos/win32ss/gdi/ntgdi/font.c b/reactos/win32ss/gdi/ntgdi/font.c
index 2543e82be91..01ee171ab23 100644
--- a/reactos/win32ss/gdi/ntgdi/font.c
+++ b/reactos/win32ss/gdi/ntgdi/font.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS win32 kernel mode subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/objects/font.c
+ * FILE:            win32ss/gdi/ntgdi/font.c
  * PURPOSE:         Font
  * PROGRAMMER:
  */
diff --git a/reactos/win32ss/gdi/ntgdi/freetype.c b/reactos/win32ss/gdi/ntgdi/freetype.c
index 58b4e4be613..01b325647a2 100644
--- a/reactos/win32ss/gdi/ntgdi/freetype.c
+++ b/reactos/win32ss/gdi/ntgdi/freetype.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS win32 kernel mode subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/objects/freetype.c
+ * FILE:            win32ss/gdi/ntgdi/freetype.c
  * PURPOSE:         FreeType font engine interface
  * PROGRAMMER:      Copyright 2001 Huw D M Davies for CodeWeavers.
  *                  Copyright 2006 Dmitry Timoshkov for CodeWeavers.
diff --git a/reactos/win32ss/gdi/ntgdi/gdidbg.c b/reactos/win32ss/gdi/ntgdi/gdidbg.c
index e3b3d0683cd..2d5154e48ce 100644
--- a/reactos/win32ss/gdi/ntgdi/gdidbg.c
+++ b/reactos/win32ss/gdi/ntgdi/gdidbg.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS win32 kernel mode subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/objects/gdidbg.c
+ * FILE:            win32ss/gdi/ntgdi/gdidbg.c
  * PURPOSE:         Special debugging functions for GDI
  * PROGRAMMERS:     Timo Kreuzer
  */
diff --git a/reactos/win32ss/gdi/ntgdi/gdikdbgext.c b/reactos/win32ss/gdi/ntgdi/gdikdbgext.c
index 9118b313571..53c7e04eb01 100644
--- a/reactos/win32ss/gdi/ntgdi/gdikdbgext.c
+++ b/reactos/win32ss/gdi/ntgdi/gdikdbgext.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS win32 kernel mode subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            win32ss/gdi/ntgdi/gdikdbgext.x
+ * FILE:            win32ss/gdi/ntgdi/gdikdbgext.c
  * PURPOSE:         KDBG extension for GDI
  * PROGRAMMERS:     Timo Kreuzer
  */
diff --git a/reactos/win32ss/gdi/ntgdi/gdiobj.c b/reactos/win32ss/gdi/ntgdi/gdiobj.c
index d4212a2d08a..37a1ec2263b 100644
--- a/reactos/win32ss/gdi/ntgdi/gdiobj.c
+++ b/reactos/win32ss/gdi/ntgdi/gdiobj.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS win32 kernel mode subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/objects/gdiobj.c
+ * FILE:            win32ss/gdi/ntgdi/gdiobj.c
  * PURPOSE:         General GDI object manipulation routines
  * PROGRAMMERS:     Timo Kreuzer
  */
diff --git a/reactos/win32ss/gdi/ntgdi/gdipool.c b/reactos/win32ss/gdi/ntgdi/gdipool.c
index 410b2729c1c..d85972f38dd 100644
--- a/reactos/win32ss/gdi/ntgdi/gdipool.c
+++ b/reactos/win32ss/gdi/ntgdi/gdipool.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS win32 kernel mode subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/objects/gdipool.c
+ * FILE:            win32ss/gdi/ntgdi/gdipool.c
  * PURPOSE:         Static size allocator for user mode object attributes
  * PROGRAMMERS:     Timo Kreuzer
  */
diff --git a/reactos/win32ss/gdi/ntgdi/icm.c b/reactos/win32ss/gdi/ntgdi/icm.c
index 9a2812b2451..046af292d42 100644
--- a/reactos/win32ss/gdi/ntgdi/icm.c
+++ b/reactos/win32ss/gdi/ntgdi/icm.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS Win32k Subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            win32k/objects/icm.c
+ * FILE:            win32ss/gdi/ntgdi/icm.c
  * PURPOSE:         Icm functions
  * PROGRAMMERS:     ...
  */
diff --git a/reactos/win32ss/gdi/ntgdi/line.c b/reactos/win32ss/gdi/ntgdi/line.c
index fec41c6a059..02f81aa6f59 100644
--- a/reactos/win32ss/gdi/ntgdi/line.c
+++ b/reactos/win32ss/gdi/ntgdi/line.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS Win32k Subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            win32k/objects/line.c
+ * FILE:            win32ss/gdi/ntgdi/line.c
  * PURPOSE:         Line functions
  * PROGRAMMERS:     ...
  */
diff --git a/reactos/win32ss/gdi/ntgdi/metafile.c b/reactos/win32ss/gdi/ntgdi/metafile.c
index 6dafea7809d..4bdf5745838 100644
--- a/reactos/win32ss/gdi/ntgdi/metafile.c
+++ b/reactos/win32ss/gdi/ntgdi/metafile.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS Win32k Subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            win32k/objects/metafile.c
+ * FILE:            win32ss/gdi/ntgdi/metafile.c
  * PURPOSE:         Metafile Implementation
  * PROGRAMMERS:     ...
  */
diff --git a/reactos/win32ss/gdi/ntgdi/palette.c b/reactos/win32ss/gdi/ntgdi/palette.c
index 23b0ab78f7b..47f3398ae72 100644
--- a/reactos/win32ss/gdi/ntgdi/palette.c
+++ b/reactos/win32ss/gdi/ntgdi/palette.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS Win32k subsystem
  * PURPOSE:           GDI Palette Functions
- * FILE:              subsystems/win32/win32k/objects/palette.c
+ * FILE:              win32ss/gdi/ntgdi/palette.c
  * PROGRAMERS:        Jason Filby
  *                    Timo Kreuzer
  */
diff --git a/reactos/win32ss/gdi/ntgdi/path.c b/reactos/win32ss/gdi/ntgdi/path.c
index 3bd1d0be9c2..a1cb865bbea 100644
--- a/reactos/win32ss/gdi/ntgdi/path.c
+++ b/reactos/win32ss/gdi/ntgdi/path.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS win32 kernel mode subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/objects/path.c
+ * FILE:            win32ss/gdi/ntgdi/path.c
  * PURPOSE:         Graphics paths (BeginPath, EndPath etc.)
  * PROGRAMMER:      Copyright 1997, 1998 Martin Boehme
  *                            1999 Huw D M Davies
diff --git a/reactos/win32ss/gdi/ntgdi/pen.c b/reactos/win32ss/gdi/ntgdi/pen.c
index 058ca43483e..07126387e08 100644
--- a/reactos/win32ss/gdi/ntgdi/pen.c
+++ b/reactos/win32ss/gdi/ntgdi/pen.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           Pen functiona
- * FILE:              subsys/win32k/objects/pen.c
+ * FILE:              win32ss/gdi/ntgdi/pen.c
  * PROGRAMER:
  */
 
diff --git a/reactos/win32ss/gdi/ntgdi/polyfill.c b/reactos/win32ss/gdi/ntgdi/polyfill.c
index e47b0499d2a..ca4d381518f 100644
--- a/reactos/win32ss/gdi/ntgdi/polyfill.c
+++ b/reactos/win32ss/gdi/ntgdi/polyfill.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS Win32k subsystem
  * PURPOSE:           Various Polygon Filling routines for Polygon()
- * FILE:              subsystems/win32/win32k/objects/polyfill.c
+ * FILE:              win32ss/gdi/ntgdi/polyfill.c
  * PROGRAMER:         Mark Tempel
  */
 
diff --git a/reactos/win32ss/gdi/ntgdi/print.c b/reactos/win32ss/gdi/ntgdi/print.c
index 8f663188c9a..f3226026519 100644
--- a/reactos/win32ss/gdi/ntgdi/print.c
+++ b/reactos/win32ss/gdi/ntgdi/print.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS win32 kernel mode subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/objects/print.c
+ * FILE:            win32ss/gdi/ntgdi/print.c
  * PURPOSE:         Print functions
  * PROGRAMMER:
  */
diff --git a/reactos/win32ss/gdi/ntgdi/rect.c b/reactos/win32ss/gdi/ntgdi/rect.c
index 44863781d75..1e6c19fdfd0 100644
--- a/reactos/win32ss/gdi/ntgdi/rect.c
+++ b/reactos/win32ss/gdi/ntgdi/rect.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS win32 kernel mode subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/objects/rect.c
+ * FILE:            win32ss/gdi/ntgdi/rect.c
  * PURPOSE:         Rect functions
  * PROGRAMMER:      Timo Kreuzer
  */
diff --git a/reactos/win32ss/gdi/ntgdi/stockobj.c b/reactos/win32ss/gdi/ntgdi/stockobj.c
index 3d4d9fc59b1..676ea5db944 100644
--- a/reactos/win32ss/gdi/ntgdi/stockobj.c
+++ b/reactos/win32ss/gdi/ntgdi/stockobj.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS win32 kernel mode subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/objects/stockobj.c
+ * FILE:            win32ss/gdi/ntgdi/stockobj.c
  * PURPOSE:         Stock objects functions
  * PROGRAMMER:
  */
diff --git a/reactos/win32ss/gdi/ntgdi/text.c b/reactos/win32ss/gdi/ntgdi/text.c
index 290cb817aa8..d80a41c2d83 100644
--- a/reactos/win32ss/gdi/ntgdi/text.c
+++ b/reactos/win32ss/gdi/ntgdi/text.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS win32 kernel mode subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/objects/text.c
+ * FILE:            win32ss/gdi/ntgdi/text.c
  * PURPOSE:         Text/Font
  * PROGRAMMER:
  */
diff --git a/reactos/win32ss/gdi/ntgdi/wingl.c b/reactos/win32ss/gdi/ntgdi/wingl.c
index 97517f0a4af..6c02b80382d 100644
--- a/reactos/win32ss/gdi/ntgdi/wingl.c
+++ b/reactos/win32ss/gdi/ntgdi/wingl.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS win32 kernel mode subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/objects/wingl.c
+ * FILE:            win32ss/gdi/ntgdi/wingl.c
  * PURPOSE:         WinGL API
  * PROGRAMMER:
  */
diff --git a/reactos/win32ss/include/ntgdihdl.h b/reactos/win32ss/include/ntgdihdl.h
index c2b31c885db..647acb341c6 100644
--- a/reactos/win32ss/include/ntgdihdl.h
+++ b/reactos/win32ss/include/ntgdihdl.h
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Win32 Graphical Subsystem (WIN32K)
- * FILE:            include/win32k/ntgdihal.h
+ * FILE:            win32ss/include/ntgdihdl.h
  * PURPOSE:         Win32 Shared GDI Handle/Object Types
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
diff --git a/reactos/win32ss/include/ntgdityp.h b/reactos/win32ss/include/ntgdityp.h
index 24e0196a87a..258d73d5d02 100644
--- a/reactos/win32ss/include/ntgdityp.h
+++ b/reactos/win32ss/include/ntgdityp.h
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Win32 Graphical Subsystem (WIN32K)
- * FILE:            include/win32k/ntgdityp.h
+ * FILE:            win32ss/include/ntgdityp.h
  * PURPOSE:         Win32 Shared GDI Types for NtGdi*
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
diff --git a/reactos/win32ss/include/ntusrtyp.h b/reactos/win32ss/include/ntusrtyp.h
index 038a6895b73..6ce571f3ad6 100644
--- a/reactos/win32ss/include/ntusrtyp.h
+++ b/reactos/win32ss/include/ntusrtyp.h
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Win32 Graphical Subsystem (WIN32K)
- * FILE:            include/win32k/ntusrtyp.h
+ * FILE:            win32ss/include/ntusrtyp.h
  * PURPOSE:         Win32 Shared USER Types for NtUser*
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
diff --git a/reactos/win32ss/napi.h b/reactos/win32ss/napi.h
index 58319329f60..3bce0f7aaba 100644
--- a/reactos/win32ss/napi.h
+++ b/reactos/win32ss/napi.h
@@ -1,5 +1,5 @@
 /*
- * FILE:            subsystems/win32/win32k/include/napi.h
+ * FILE:            win32ss/napi.h
  * COPYRIGHT:       GNU GPL, see COPYING in the top level directory
  * PURPOSE:         System Call Table for Native API
  * PROGRAMMER:      Timo Kreuzer
diff --git a/reactos/win32ss/reactx/dxapi/main.c b/reactos/win32ss/reactx/dxapi/main.c
index 58443ad2a51..6285a87a2b1 100644
--- a/reactos/win32ss/reactx/dxapi/main.c
+++ b/reactos/win32ss/reactx/dxapi/main.c
@@ -3,7 +3,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Native driver for dxg implementation
- * FILE:             drivers/directx/dxg/main.c
+ * FILE:             win32ss/reactx/dxapi/main.c
  * PROGRAMER:        Magnus olsen (magnus@greatlord.com)
  * REVISION HISTORY:
  *       15/10-2007   Magnus Olsen
diff --git a/reactos/win32ss/reactx/dxg/ddhmg.c b/reactos/win32ss/reactx/dxg/ddhmg.c
index caa5cafeb15..13e002b69d3 100644
--- a/reactos/win32ss/reactx/dxg/ddhmg.c
+++ b/reactos/win32ss/reactx/dxg/ddhmg.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Native driver for dxg implementation
- * FILE:             drivers/directx/dxg/ddhmg.c
+ * FILE:             win32ss/reactx/dxg/ddhmg.c
  * PROGRAMER:        Magnus olsen (magnus@greatlord.com)
  * REVISION HISTORY:
  *       30/12-2007   Magnus Olsen
diff --git a/reactos/win32ss/reactx/dxg/eng.c b/reactos/win32ss/reactx/dxg/eng.c
index ab10bd3a382..77f9755540f 100644
--- a/reactos/win32ss/reactx/dxg/eng.c
+++ b/reactos/win32ss/reactx/dxg/eng.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Native driver for dxg implementation
- * FILE:             drivers/directx/dxg/main.c
+ * FILE:             win32ss/reactx/dxg/eng.c
  * PROGRAMER:        Magnus olsen (magnus@greatlord.com)
  * REVISION HISTORY:
  *       30/12-2007   Magnus Olsen
diff --git a/reactos/win32ss/reactx/dxg/historic.c b/reactos/win32ss/reactx/dxg/historic.c
index 127933399bb..a24eee8c634 100644
--- a/reactos/win32ss/reactx/dxg/historic.c
+++ b/reactos/win32ss/reactx/dxg/historic.c
@@ -3,7 +3,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Native driver for dxg implementation
- * FILE:             drivers/directx/dxg/main.c
+ * FILE:             win32ss/reactx/dxg/historic.c
  * PROGRAMER:        Magnus olsen (magnus@greatlord.com)
  * REVISION HISTORY:
  *       15/10-2007   Magnus Olsen
diff --git a/reactos/win32ss/reactx/dxg/main.c b/reactos/win32ss/reactx/dxg/main.c
index bdd0335bab2..10b5df4d895 100644
--- a/reactos/win32ss/reactx/dxg/main.c
+++ b/reactos/win32ss/reactx/dxg/main.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Native driver for dxg implementation
- * FILE:             drivers/directx/dxg/main.c
+ * FILE:             win32ss/reactx/dxg/main.c
  * PROGRAMER:        Magnus olsen (magnus@greatlord.com)
  * REVISION HISTORY:
  *       15/10-2007   Magnus Olsen
diff --git a/reactos/win32ss/reactx/dxgthk/main.c b/reactos/win32ss/reactx/dxgthk/main.c
index 87ec3e0fc76..6a856c901ba 100644
--- a/reactos/win32ss/reactx/dxgthk/main.c
+++ b/reactos/win32ss/reactx/dxgthk/main.c
@@ -3,7 +3,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Native driver for dxg implementation
- * FILE:             drivers/directx/dxg/main.c
+ * FILE:             win32ss/reactx/dxgthk/main.c
  * PROGRAMER:        Magnus olsen (magnus@greatlord.com)
  * REVISION HISTORY:
  *       15/10-2007   Magnus Olsen
diff --git a/reactos/win32ss/reactx/ntddraw/d3d.c b/reactos/win32ss/reactx/ntddraw/d3d.c
index af9f8c990c8..07eb7297829 100644
--- a/reactos/win32ss/reactx/ntddraw/d3d.c
+++ b/reactos/win32ss/reactx/ntddraw/d3d.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Native DirectDraw implementation
- * FILE:             subsystems/win32/win32k/ntddraw/d3d.c
+ * FILE:             win32ss/reactx/ntddraw/d3d.c
  * PROGRAMER:        Magnus olsen (magnus@greatlord.com)
  * REVISION HISTORY:
  *       19/1-2006   Magnus Olsen
diff --git a/reactos/win32ss/reactx/ntddraw/dd.c b/reactos/win32ss/reactx/ntddraw/dd.c
index e4665cddd5e..152daecf0d9 100644
--- a/reactos/win32ss/reactx/ntddraw/dd.c
+++ b/reactos/win32ss/reactx/ntddraw/dd.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Native DirectDraw implementation
- * FILE:             subsystems/win32/win32k/ntddraw/dd.c
+ * FILE:             win32ss/reactx/ntddraw/dd.c
  * PROGRAMER:        Magnus Olsen (greatlord@reactos.org)
  * REVISION HISTORY:
  *       19/1-2006   Magnus Olsen
diff --git a/reactos/win32ss/reactx/ntddraw/ddraw.c b/reactos/win32ss/reactx/ntddraw/ddraw.c
index 7ce8adc19aa..3cd73fa7535 100644
--- a/reactos/win32ss/reactx/ntddraw/ddraw.c
+++ b/reactos/win32ss/reactx/ntddraw/ddraw.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Native DirectDraw implementation
- * FILE:             subsystems/win32/win32k/ntddraw/ddraw.c
+ * FILE:             win32ss/reactx/ntddraw/ddraw.c
  * PROGRAMER:        Magnus olsen (magnus@greatlord.com)
  * REVISION HISTORY:
  *       19/1-2006   Magnus Olsen
diff --git a/reactos/win32ss/reactx/ntddraw/ddsurf.c b/reactos/win32ss/reactx/ntddraw/ddsurf.c
index 0d96cb3735f..aacde0c03da 100644
--- a/reactos/win32ss/reactx/ntddraw/ddsurf.c
+++ b/reactos/win32ss/reactx/ntddraw/ddsurf.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Native DirectDraw implementation
- * FILE:             subsystems/win32/win32k/ntddraw/ddsurf.c
+ * FILE:             win32ss/reactx/ntddraw/ddsurf.c
  * PROGRAMER:        Magnus Olsen (greatlord@reactos.org)
  * REVISION HISTORY:
  *       19/7-2006  Magnus Olsen
diff --git a/reactos/win32ss/reactx/ntddraw/dvp.c b/reactos/win32ss/reactx/ntddraw/dvp.c
index 4dddb94fcd0..f6d92053137 100644
--- a/reactos/win32ss/reactx/ntddraw/dvp.c
+++ b/reactos/win32ss/reactx/ntddraw/dvp.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Native DirectDraw implementation
- * FILE:             subsystems/win32/win32k/ntddraw/dvp.c
+ * FILE:             win32ss/reactx/ntddraw/dvp.c
  * PROGRAMER:        Magnus olsen (magnus@greatlord.com)
  * REVISION HISTORY:
  *       19/1-2006   Magnus Olsen
diff --git a/reactos/win32ss/reactx/ntddraw/dxeng.c b/reactos/win32ss/reactx/ntddraw/dxeng.c
index b427938f88a..bafc57a50fe 100644
--- a/reactos/win32ss/reactx/ntddraw/dxeng.c
+++ b/reactos/win32ss/reactx/ntddraw/dxeng.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:          ReactOS Win32 Subsystem
  * LICENSE:          GPL - See COPYING in the top level directory
- * FILE:             subsystems/win32/win32k/ntddraw/dxeng.c
+ * FILE:             win32ss/reactx/ntddraw/dxeng.c
  * PURPOSE:          Implementation of DxEng functions
  * PROGRAMMERS:      Magnus Olsen (magnus@greatlord.com)
  */
diff --git a/reactos/win32ss/reactx/ntddraw/eng.c b/reactos/win32ss/reactx/ntddraw/eng.c
index ae7e9d4502b..426ea70a9e5 100644
--- a/reactos/win32ss/reactx/ntddraw/eng.c
+++ b/reactos/win32ss/reactx/ntddraw/eng.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Native DirectDraw implementation
- * FILE:             subsystems/win32/win32k/ntddraw/eng.c
+ * FILE:             win32ss/reactx/ntddraw/eng.c
  * PROGRAMER:        Magnus olsen (magnus@greatlord.com)
  * REVISION HISTORY:
  *       19/1-2006   Magnus Olsen
diff --git a/reactos/win32ss/reactx/ntddraw/mocomp.c b/reactos/win32ss/reactx/ntddraw/mocomp.c
index bc80584faa9..ead4cfee453 100644
--- a/reactos/win32ss/reactx/ntddraw/mocomp.c
+++ b/reactos/win32ss/reactx/ntddraw/mocomp.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Native DirectDraw implementation
- * FILE:             subsystems/win32/win32k/ntddraw/mocomp.c
+ * FILE:             win32ss/reactx/ntddraw/mocomp.c
  * PROGRAMER:        Magnus Olsen (magnus@greatlord.com)
  * REVISION HISTORY:
  *       19/1-2006   Magnus Olsen
diff --git a/reactos/win32ss/user/ntuser/accelerator.c b/reactos/win32ss/user/ntuser/accelerator.c
index ba99a46781b..8348cea2b2f 100644
--- a/reactos/win32ss/user/ntuser/accelerator.c
+++ b/reactos/win32ss/user/ntuser/accelerator.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Window accelerator
- * FILE:             subsystems/win32/win32k/ntuser/accelerator.c
+ * FILE:             win32ss/user/ntuser/accelerator.c
  * PROGRAMER:        Casper S. Hornstrup (chorns@users.sourceforge.net)
  *                   Copyright 1993 Martin Ayotte
  *                   Copyright 1994 Alexandre Julliard
diff --git a/reactos/win32ss/user/ntuser/callproc.c b/reactos/win32ss/user/ntuser/callproc.c
index ebf95cac013..010ad431199 100644
--- a/reactos/win32ss/user/ntuser/callproc.c
+++ b/reactos/win32ss/user/ntuser/callproc.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Callproc support
- * FILE:             subsystems/win32/win32k/ntuser/callproc.c
+ * FILE:             win32ss/user/ntuser/callproc.c
  * PROGRAMER:        Thomas Weidenmueller <w3seek@reactos.com>
  */
 
diff --git a/reactos/win32ss/user/ntuser/caret.c b/reactos/win32ss/user/ntuser/caret.c
index 6f6bc3ec17f..d415918271a 100644
--- a/reactos/win32ss/user/ntuser/caret.c
+++ b/reactos/win32ss/user/ntuser/caret.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS Win32k subsystem
  * PURPOSE:          Caret functions
- * FILE:             subsystems/win32/win32k/ntuser/caret.c
+ * FILE:             win32ss/user/ntuser/caret.c
  * PROGRAMER:        Thomas Weidenmueller (w3seek@users.sourceforge.net)
  */
 
diff --git a/reactos/win32ss/user/ntuser/console.c b/reactos/win32ss/user/ntuser/console.c
index 378933b7d25..9b34ee1cd84 100644
--- a/reactos/win32ss/user/ntuser/console.c
+++ b/reactos/win32ss/user/ntuser/console.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS Win32k subsystem
  * PURPOSE:          Console support functions for CONSRV
- * FILE:             subsystems/win32/win32k/ntuser/console.c
+ * FILE:             win32ss/user/ntuser/console.c
  * PROGRAMMER:       Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
diff --git a/reactos/win32ss/user/ntuser/csr.c b/reactos/win32ss/user/ntuser/csr.c
index 4c1c89ba902..c23a0f042a5 100644
--- a/reactos/win32ss/user/ntuser/csr.c
+++ b/reactos/win32ss/user/ntuser/csr.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS Win32k subsystem
  * PURPOSE:          Interface between Win32k and USERSRV
- * FILE:             subsystems/win32/win32k/ntuser/csr.c
+ * FILE:             win32ss/user/ntuser/csr.c
  * PROGRAMER:        Hermes Belusca-Maito (hermes.belusca@sfr.fr), based on
  *                   the original code by Ge van Geldorp (ge@gse.nl) and by
  *                   the CSR code in NTDLL.
diff --git a/reactos/win32ss/user/ntuser/csr.h b/reactos/win32ss/user/ntuser/csr.h
index 96d9fa31bca..8359e733a2e 100644
--- a/reactos/win32ss/user/ntuser/csr.h
+++ b/reactos/win32ss/user/ntuser/csr.h
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS Win32k subsystem
  * PURPOSE:          Interface between Win32k and USERSRV
- * FILE:             subsystems/win32/win32k/ntuser/csr.h
+ * FILE:             win32ss/user/ntuser/csr.h
  * PROGRAMER:        Hermes Belusca-Maito (hermes.belusca@sfr.fr), based on
  *                   the original code by Ge van Geldorp (ge@gse.nl) and by
  *                   the CSR code in NTDLL.
diff --git a/reactos/win32ss/user/ntuser/display.c b/reactos/win32ss/user/ntuser/display.c
index a635150090c..7b6a753eb80 100644
--- a/reactos/win32ss/user/ntuser/display.c
+++ b/reactos/win32ss/user/ntuser/display.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Video initialization and display settings
- * FILE:             subsystems/win32/win32k/ntuser/display.c
+ * FILE:             win32ss/user/ntuser/display.c
  * PROGRAMER:        Timo Kreuzer (timo.kreuzer@reactos.org)
  */
 
diff --git a/reactos/win32ss/user/ntuser/focus.c b/reactos/win32ss/user/ntuser/focus.c
index fb17e3f88d1..17e1e651df8 100644
--- a/reactos/win32ss/user/ntuser/focus.c
+++ b/reactos/win32ss/user/ntuser/focus.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS Win32k subsystem
  * PURPOSE:          Focus functions
- * FILE:             subsystems/win32/win32k/ntuser/focus.c
+ * FILE:             win32ss/user/ntuser/focus.c
  * PROGRAMER:        ReactOS Team
  */
 
diff --git a/reactos/win32ss/user/ntuser/guicheck.c b/reactos/win32ss/user/ntuser/guicheck.c
index cc0cf9d44bc..ec76333ad4b 100644
--- a/reactos/win32ss/user/ntuser/guicheck.c
+++ b/reactos/win32ss/user/ntuser/guicheck.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          GUI state check
- * FILE:             subsys/win32k/ntuser/guicheck.c
+ * FILE:             win32ss/user/ntuser/guicheck.c
  * PROGRAMER:        Casper S. Hornstrup (chorns@users.sourceforge.net)
  * NOTES:            The GuiCheck() function performs a few delayed operations:
  *                   1) A GUI process is assigned a window station
diff --git a/reactos/win32ss/user/ntuser/kbdlayout.c b/reactos/win32ss/user/ntuser/kbdlayout.c
index da78d846bc3..27eaf06bea5 100644
--- a/reactos/win32ss/user/ntuser/kbdlayout.c
+++ b/reactos/win32ss/user/ntuser/kbdlayout.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS Win32k subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/ntuser/kbdlayout.c
+ * FILE:            win32ss/user/ntuser/kbdlayout.c
  * PURPOSE:         Keyboard layout management
  * COPYRIGHT:       Copyright 2007 Saveliy Tretiakov
  *                  Copyright 2008 Colin Finck
diff --git a/reactos/win32ss/user/ntuser/menu.c b/reactos/win32ss/user/ntuser/menu.c
index 92631c498c4..dd7e4582bad 100644
--- a/reactos/win32ss/user/ntuser/menu.c
+++ b/reactos/win32ss/user/ntuser/menu.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Menus
- * FILE:             subsys/win32k/ntuser/menu.c
+ * FILE:             win32ss/user/ntuser/menu.c
  * PROGRAMER:        Thomas Weidenmueller (w3seek@users.sourceforge.net)
  */
 
diff --git a/reactos/win32ss/user/ntuser/metric.c b/reactos/win32ss/user/ntuser/metric.c
index fd39848d893..df7138b999b 100644
--- a/reactos/win32ss/user/ntuser/metric.c
+++ b/reactos/win32ss/user/ntuser/metric.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS Win32k subsystem
  * PURPOSE:          Window classes
- * FILE:             subsystems/win32/win32k/ntuser/metric.c
+ * FILE:             win32ss/user/ntuser/metric.c
  * PROGRAMER:        Casper S. Hornstrup (chorns@users.sourceforge.net)
  *                   Timo Kreuzer (timo.kreuzer@reactos.org)
  */
diff --git a/reactos/win32ss/user/ntuser/misc/file.c b/reactos/win32ss/user/ntuser/misc/file.c
index c8204fd1dd7..5dcd20a020a 100644
--- a/reactos/win32ss/user/ntuser/misc/file.c
+++ b/reactos/win32ss/user/ntuser/misc/file.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        GPL, see COPYING in the top level directory
  * PROJECT:          ReactOS win32 kernel mode subsystem server
  * PURPOSE:          File access support routines
- * FILE:             subsystem/win32/win32k/misc/registry.c
+ * FILE:             win32ss/user/ntuser/misc/file.c
  * PROGRAMER:        Timo Kreuzer (timo.kreuzer@reactos.org)
  */
 
diff --git a/reactos/win32ss/user/ntuser/misc/registry.c b/reactos/win32ss/user/ntuser/misc/registry.c
index 61db087dee9..a1995aba055 100644
--- a/reactos/win32ss/user/ntuser/misc/registry.c
+++ b/reactos/win32ss/user/ntuser/misc/registry.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        GPL, see COPYING in the top level directory
  * PROJECT:          ReactOS win32 kernel mode subsystem server
  * PURPOSE:          Registry loading and storing
- * FILE:             subsystem/win32/win32k/misc/registry.c
+ * FILE:             win32ss/user/ntuser/misc/registry.c
  * PROGRAMER:        Timo Kreuzer (timo.kreuzer@reactos.org)
  */
 
diff --git a/reactos/win32ss/user/ntuser/misc/rtlstr.c b/reactos/win32ss/user/ntuser/misc/rtlstr.c
index 73c92bf7bde..b37e3958a31 100644
--- a/reactos/win32ss/user/ntuser/misc/rtlstr.c
+++ b/reactos/win32ss/user/ntuser/misc/rtlstr.c
@@ -1,6 +1,6 @@
 /*
  * PROJECT:         ReactOS win32k.sys
- * FILE:            subsystems/win32/win32k/misc/rtlstr.c
+ * FILE:            win32ss/user/ntuser/misc/rtlstr.c
  * PURPOSE:         Large Strings
  * PROGRAMMER:
  *
diff --git a/reactos/win32ss/user/ntuser/mouse.c b/reactos/win32ss/user/ntuser/mouse.c
index 0793ed11d66..fc3827e3450 100644
--- a/reactos/win32ss/user/ntuser/mouse.c
+++ b/reactos/win32ss/user/ntuser/mouse.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Mouse functions
- * FILE:             subsystems/win32/win32k/ntuser/input.c
+ * FILE:             win32ss/user/ntuser/mouse.c
  * PROGRAMERS:       Casper S. Hornstrup (chorns@users.sourceforge.net)
  *                   Rafal Harabien (rafalh@reactos.org)
  */
diff --git a/reactos/win32ss/user/ntuser/object.c b/reactos/win32ss/user/ntuser/object.c
index f2e249831c0..ec30a718d5b 100644
--- a/reactos/win32ss/user/ntuser/object.c
+++ b/reactos/win32ss/user/ntuser/object.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          User handle manager
- * FILE:             subsystems/win32/win32k/ntuser/object.c
+ * FILE:             win32ss/user/ntuser/object.c
  * PROGRAMER:        Copyright (C) 2001 Alexandre Julliard
  */
 
diff --git a/reactos/win32ss/user/ntuser/scrollbar.c b/reactos/win32ss/user/ntuser/scrollbar.c
index 462690b2945..041fea485e1 100644
--- a/reactos/win32ss/user/ntuser/scrollbar.c
+++ b/reactos/win32ss/user/ntuser/scrollbar.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Scrollbars
- * FILE:             subsys/win32k/ntuser/scrollbar.c
+ * FILE:             win32ss/user/ntuser/scrollbar.c
  * PROGRAMER:        Thomas Weidenmueller (w3seek@users.sourceforge.net)
  *                   Jason Filby (jasonfilby@yahoo.com)
  */
diff --git a/reactos/win32ss/user/ntuser/session.c b/reactos/win32ss/user/ntuser/session.c
index 4247a342239..acc54ef2d7d 100644
--- a/reactos/win32ss/user/ntuser/session.c
+++ b/reactos/win32ss/user/ntuser/session.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Session stuff
- * FILE:             subsys/win32k/ntuser/session.c
+ * FILE:             win32ss/user/ntuser/session.c
  * PROGRAMER:        Gunnar
  */
 
diff --git a/reactos/win32ss/user/ntuser/shutdown.c b/reactos/win32ss/user/ntuser/shutdown.c
index 61b70d59081..a589311a295 100644
--- a/reactos/win32ss/user/ntuser/shutdown.c
+++ b/reactos/win32ss/user/ntuser/shutdown.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS Win32k subsystem
  * PURPOSE:          Shutdown routines
- * FILE:             subsystems/win32/win32k/ntuser/shutdown.c
+ * FILE:             win32ss/user/ntuser/shutdown.c
  * PROGRAMER:        Hermes Belusca
  */
 
diff --git a/reactos/win32ss/user/ntuser/simplecall.c b/reactos/win32ss/user/ntuser/simplecall.c
index 86d9cee7415..e1b0392fc7e 100644
--- a/reactos/win32ss/user/ntuser/simplecall.c
+++ b/reactos/win32ss/user/ntuser/simplecall.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          NtUserCallXxx call stubs
- * FILE:             subsystem/win32/win32k/ntuser/simplecall.c
+ * FILE:             win32ss/user/ntuser/simplecall.c
  * PROGRAMER:        Ge van Geldorp (ge@gse.nl)
  */
 
diff --git a/reactos/win32ss/user/ntuser/sysparams.c b/reactos/win32ss/user/ntuser/sysparams.c
index 2a4baf0d5b3..01889129a79 100644
--- a/reactos/win32ss/user/ntuser/sysparams.c
+++ b/reactos/win32ss/user/ntuser/sysparams.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        GPL, see COPYING in the top level directory
  * PROJECT:          ReactOS win32 kernel mode subsystem server
  * PURPOSE:          System parameters functions
- * FILE:             subsystems/win32/win32k/ntuser/sysparams.c
+ * FILE:             win32ss/user/ntuser/sysparams.c
  * PROGRAMER:        Timo Kreuzer (timo.kreuzer@reactos.org)
  */
 
diff --git a/reactos/win32ss/user/ntuser/timer.c b/reactos/win32ss/user/ntuser/timer.c
index 3bb48e1a3ba..d2789bb1024 100644
--- a/reactos/win32ss/user/ntuser/timer.c
+++ b/reactos/win32ss/user/ntuser/timer.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Window timers messages
- * FILE:             subsystems/win32/win32k/ntuser/timer.c
+ * FILE:             win32ss/user/ntuser/timer.c
  * PROGRAMER:        Gunnar
  *                   Thomas Weidenmueller (w3seek@users.sourceforge.net)
  *                   Michael Martin (michael.martin@reactos.org)
diff --git a/reactos/win32ss/user/ntuser/useratom.c b/reactos/win32ss/user/ntuser/useratom.c
index b9cbf185f80..79957f505fb 100644
--- a/reactos/win32ss/user/ntuser/useratom.c
+++ b/reactos/win32ss/user/ntuser/useratom.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          User Atom helper routines
- * FILE:             subsys/win32k/ntuser/useratom.c
+ * FILE:             win32ss/user/ntuser/useratom.c
  * PROGRAMER:        Filip Navara <xnavara@volny.cz>
  */
 
diff --git a/reactos/win32ss/user/ntuser/vis.c b/reactos/win32ss/user/ntuser/vis.c
index b29cf47b75a..670cc7537b9 100644
--- a/reactos/win32ss/user/ntuser/vis.c
+++ b/reactos/win32ss/user/ntuser/vis.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Visibility computations
- * FILE:             subsys/win32k/ntuser/vis.c
+ * FILE:             win32ss/user/ntuser/vis.c
  * PROGRAMMER:       Ge van Geldorp (ge@gse.nl)
  */
 
diff --git a/reactos/win32ss/user/ntuser/vis.h b/reactos/win32ss/user/ntuser/vis.h
index d398bd8c73a..5ff29ab1479 100644
--- a/reactos/win32ss/user/ntuser/vis.h
+++ b/reactos/win32ss/user/ntuser/vis.h
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS Win32k subsystem
  * PURPOSE:          Visibility computations interface definition
- * FILE:             include/win32k/vis.h
+ * FILE:             win32ss/user/ntuser/vis.h
  * PROGRAMMER:       Ge van Geldorp (ge@gse.nl)
  *
  */
diff --git a/reactos/win32ss/user/ntuser/windc.c b/reactos/win32ss/user/ntuser/windc.c
index 7427b9fe11c..1cd4697c022 100644
--- a/reactos/win32ss/user/ntuser/windc.c
+++ b/reactos/win32ss/user/ntuser/windc.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:         ReactOS Win32k subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/ntuser/windc.c
+ * FILE:            win32ss/user/ntuser/windc.c
  * PURPOSE:         Window DC management
  * COPYRIGHT:       Copyright 2007 ReactOS Team
  */
diff --git a/reactos/win32ss/user/ntuser/winpos.c b/reactos/win32ss/user/ntuser/winpos.c
index 8ba06b38ce3..0d9afbe0258 100644
--- a/reactos/win32ss/user/ntuser/winpos.c
+++ b/reactos/win32ss/user/ntuser/winpos.c
@@ -2,7 +2,7 @@
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Windows
- * FILE:             win32ss/user/ntuser/window.c
+ * FILE:             win32ss/user/ntuser/winpos.c
  * PROGRAMER:        Casper S. Hornstrup (chorns@users.sourceforge.net)
  */