diff --git a/reactos/dll/ntdll/ldr/ldrpe.c b/reactos/dll/ntdll/ldr/ldrpe.c
index 40fda59dd20..aa3ef415d4b 100644
--- a/reactos/dll/ntdll/ldr/ldrpe.c
+++ b/reactos/dll/ntdll/ldr/ldrpe.c
@@ -14,7 +14,6 @@
 
 /* GLOBALS *******************************************************************/
 
-ULONG LdrpFatalHardErrorCount;
 PVOID LdrpManifestProberRoutine;
 ULONG LdrpNormalSnap;
 
diff --git a/reactos/dll/win32/kernel32/client/proc.c b/reactos/dll/win32/kernel32/client/proc.c
index cc29ab36112..1ba10577cec 100644
--- a/reactos/dll/win32/kernel32/client/proc.c
+++ b/reactos/dll/win32/kernel32/client/proc.c
@@ -34,7 +34,6 @@ VOID WINAPI
 RegisterWaitForInputIdle(WaitForInputIdleType lpfnRegisterWaitForInputIdle);
 
 UNICODE_STRING BasePathVariableName = RTL_CONSTANT_STRING(L"PATH");
-UNICODE_STRING BaseDefaultPath;
 PLDR_DATA_TABLE_ENTRY BasepExeLdrEntry;
 
 #define CMD_STRING L"cmd /c "
diff --git a/reactos/ntoskrnl/cache/section/data.c b/reactos/ntoskrnl/cache/section/data.c
index bfa58827d6c..f168d62b835 100644
--- a/reactos/ntoskrnl/cache/section/data.c
+++ b/reactos/ntoskrnl/cache/section/data.c
@@ -58,7 +58,6 @@ extern KSPIN_LOCK MiSectionPageTableLock;
 /* GLOBALS *******************************************************************/
 
 ULONG_PTR MmSubsectionBase;
-BOOLEAN MmAllocationFragment;
 
 NTSTATUS
 NTAPI
diff --git a/reactos/ntoskrnl/mm/freelist.c b/reactos/ntoskrnl/mm/freelist.c
index 7eef9593f95..b9097511cd8 100644
--- a/reactos/ntoskrnl/mm/freelist.c
+++ b/reactos/ntoskrnl/mm/freelist.c
@@ -33,7 +33,6 @@ PFN_NUMBER MmAvailablePages;
 PFN_NUMBER MmResidentAvailablePages;
 PFN_NUMBER MmResidentAvailableAtInit;
 
-SIZE_T MmTotalCommitLimit;
 SIZE_T MmTotalCommittedPages;
 SIZE_T MmSharedCommit;
 SIZE_T MmDriverCommit;
diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c
index 7749a03eb05..6948d47de18 100644
--- a/reactos/ntoskrnl/mm/section.c
+++ b/reactos/ntoskrnl/mm/section.c
@@ -124,8 +124,6 @@ MM_SECTION_PAGEOUT_CONTEXT;
 
 POBJECT_TYPE MmSectionObjectType = NULL;
 
-SIZE_T MmAllocationFragment;
-
 ULONG_PTR MmSubsectionBase;
 
 static ULONG SectionCharacteristicsToProtect[16] =
diff --git a/reactos/subsystems/win32/csrss/csrsrv/api/process.c b/reactos/subsystems/win32/csrss/csrsrv/api/process.c
index 58fb959611b..dd726f5e551 100644
--- a/reactos/subsystems/win32/csrss/csrsrv/api/process.c
+++ b/reactos/subsystems/win32/csrss/csrsrv/api/process.c
@@ -1,5 +1,5 @@
 /*
- * reactos/subsys/csrss/api/process.c
+ * subsystems/win32/csrss/csrsrv/api/process.c
  *
  * "\windows\ApiPort" port process management functions
  *
diff --git a/reactos/subsystems/win32/csrss/csrsrv/api/user.c b/reactos/subsystems/win32/csrss/csrsrv/api/user.c
index de4e49f66e1..952dc24b710 100644
--- a/reactos/subsystems/win32/csrss/csrsrv/api/user.c
+++ b/reactos/subsystems/win32/csrss/csrsrv/api/user.c
@@ -1,6 +1,6 @@
 /* $Id$
  *
- * reactos/subsys/csrss/api/user.c
+ * subsystems/win32/csrss/csrsrv/api/user.c
  *
  * User functions
  *
diff --git a/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c b/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
index 88005c6fe7b..fbfb7709343 100644
--- a/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
+++ b/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c
@@ -1,6 +1,6 @@
 /* $Id$
  *
- * reactos/subsys/csrss/api/wapi.c
+ * subsystems/win32/csrss/csrsrv/api/wapi.c
  *
  * CSRSS port message processing
  *
diff --git a/reactos/subsystems/win32/csrss/csrsrv/init.c b/reactos/subsystems/win32/csrss/csrsrv/init.c
index fa8d6273765..b10527e4078 100644
--- a/reactos/subsystems/win32/csrss/csrsrv/init.c
+++ b/reactos/subsystems/win32/csrss/csrsrv/init.c
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS CSR Sub System
- * FILE:            subsys/csr/csrsrv/init.c
+ * FILE:            subsystems/win32/csrss/csrsrv/init.c
  * PURPOSE:         CSR Server DLL Initialization
  * PROGRAMMERS:     ReactOS Portable Systems Group
  */
diff --git a/reactos/subsystems/win32/csrss/csrsrv/procsup.c b/reactos/subsystems/win32/csrss/csrsrv/procsup.c
index d139d9701d6..c62bf6a3f8d 100644
--- a/reactos/subsystems/win32/csrss/csrsrv/procsup.c
+++ b/reactos/subsystems/win32/csrss/csrsrv/procsup.c
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS CSR Sub System
- * FILE:            subsys/csr/csrsrv/procsup.c
+ * FILE:            subsystems/win32/csrss/csrsrv/procsup.c
  * PURPOSE:         CSR Process Management
  * PROGRAMMERS:     ReactOS Portable Systems Group
  *                  Alex Ionescu
@@ -26,7 +26,6 @@
 extern RTL_CRITICAL_SECTION ProcessDataLock;
 extern PCSRSS_PROCESS_DATA ProcessData[256];
 PCSRSS_PROCESS_DATA CsrRootProcess;
-LIST_ENTRY CsrThreadHashTable[256];
 SECURITY_QUALITY_OF_SERVICE CsrSecurityQos =
 {
     sizeof(SECURITY_QUALITY_OF_SERVICE),
diff --git a/reactos/subsystems/win32/csrss/csrsrv/thredsup.c b/reactos/subsystems/win32/csrss/csrsrv/thredsup.c
index e893888773b..27e5b093c0f 100644
--- a/reactos/subsystems/win32/csrss/csrsrv/thredsup.c
+++ b/reactos/subsystems/win32/csrss/csrsrv/thredsup.c
@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS CSR Sub System
- * FILE:            subsys/csr/csrsrv/procsup.c
+ * FILE:            subsystems/win32/csrss/csrsrv/thredsup.c
  * PURPOSE:         CSR Process Management
  * PROGRAMMERS:     ReactOS Portable Systems Group
  *                  Alex Ionescu