diff --git a/reactos/win32ss/user/ntuser/csr.c b/reactos/win32ss/user/ntuser/csr.c
index 2b622e846a5..820db2a7edc 100644
--- a/reactos/win32ss/user/ntuser/csr.c
+++ b/reactos/win32ss/user/ntuser/csr.c
@@ -1,50 +1,50 @@
 /* 
  * COPYRIGHT:        See COPYING in the top level directory
- * PROJECT:          ReactOS kernel
- * PURPOSE:          Interface to csrss
- * FILE:             subsys/win32k/ntuser/csr.c
+ * PROJECT:          ReactOS Win32k subsystem
+ * PURPOSE:          Interface to CSRSS / USERSRV
+ * FILE:             subsystems/win32/win32k/ntuser/csr.c
  * PROGRAMER:        Ge van Geldorp (ge@gse.nl)
  */
 
 #include <win32k.h>
 
 static HANDLE WindowsApiPort = NULL;
+// See gpepCSRSS in ntuser/ntuser.c and its initialization into NtUserInitialize()
 PEPROCESS CsrProcess = NULL;
 
 NTSTATUS FASTCALL
 CsrInit(void)
 {
-   NTSTATUS Status;
-   UNICODE_STRING PortName;
-   ULONG ConnectInfoLength;
-   SECURITY_QUALITY_OF_SERVICE Qos;   
+    NTSTATUS Status;
+    UNICODE_STRING PortName;
+    ULONG ConnectInfoLength;
+    SECURITY_QUALITY_OF_SERVICE Qos;   
 
-   RtlInitUnicodeString(&PortName, L"\\Windows\\ApiPort");
-   ConnectInfoLength = 0;
-   Qos.Length = sizeof(Qos);
-   Qos.ImpersonationLevel = SecurityDelegation;
-   Qos.ContextTrackingMode = SECURITY_STATIC_TRACKING;
-   Qos.EffectiveOnly = FALSE;
+    RtlInitUnicodeString(&PortName, L"\\Windows\\ApiPort");
+    ConnectInfoLength = 0;
+    Qos.Length = sizeof(Qos);
+    Qos.ImpersonationLevel = SecurityDelegation;
+    Qos.ContextTrackingMode = SECURITY_STATIC_TRACKING;
+    Qos.EffectiveOnly = FALSE;
 
-   Status = ZwConnectPort(&WindowsApiPort,
-                          &PortName,
-                          &Qos,
-                          NULL,
-                          NULL,
-                          NULL,
-                          NULL,
-                          &ConnectInfoLength);
-   if (! NT_SUCCESS(Status))
-   {
-      return Status;
-   }
+    Status = ZwConnectPort(&WindowsApiPort,
+                           &PortName,
+                           &Qos,
+                           NULL,
+                           NULL,
+                           NULL,
+                           NULL,
+                           &ConnectInfoLength);
+    if (!NT_SUCCESS(Status))
+    {
+        return Status;
+    }
 
-   CsrProcess = PsGetCurrentProcess();
+    CsrProcess = PsGetCurrentProcess();
 
-   return STATUS_SUCCESS;
+    return STATUS_SUCCESS;
 }
 
-
 NTSTATUS FASTCALL
 co_CsrNotify(PCSR_API_MESSAGE Request)
 {
diff --git a/reactos/win32ss/user/ntuser/csr.h b/reactos/win32ss/user/ntuser/csr.h
index 5256c03b651..94275cc7eb4 100644
--- a/reactos/win32ss/user/ntuser/csr.h
+++ b/reactos/win32ss/user/ntuser/csr.h
@@ -1,8 +1,8 @@
-/*
+/* 
  * COPYRIGHT:        See COPYING in the top level directory
- * PROJECT:          ReactOS kernel
- * PURPOSE:          Interface to csrss
- * FILE:             subsys/win32k/include/csr.h
+ * PROJECT:          ReactOS Win32k subsystem
+ * PURPOSE:          Interface to CSRSS / USERSRV
+ * FILE:             subsystems/win32/win32k/ntuser/csr.h
  * PROGRAMER:        Ge van Geldorp (ge@gse.nl)
  */
 
@@ -12,9 +12,5 @@ extern PEPROCESS CsrProcess;
 
 NTSTATUS FASTCALL CsrInit(void);
 NTSTATUS FASTCALL co_CsrNotify(PCSR_API_MESSAGE Request);
-NTSTATUS FASTCALL CsrCloseHandle(HANDLE Handle);
-NTSTATUS WINAPI CsrInsertObject(HANDLE ObjectHandle,
-                                 ACCESS_MASK DesiredAccess,
-                                 PHANDLE Handle);
 
 /* EOF */