diff --git a/subsystems/win32/csrsrv/api.c b/subsystems/win32/csrsrv/api.c
index b9a8ca73d65..111cf89d334 100644
--- a/subsystems/win32/csrsrv/api.c
+++ b/subsystems/win32/csrsrv/api.c
@@ -7,14 +7,14 @@
  * PROGRAMMERS:     Alex Ionescu (alex@relsoft.net)
  */
 
-/* INCLUDES ******************************************************************/
+/* INCLUDES *******************************************************************/
 
 #include "srv.h"
 
 #define NDEBUG
 #include <debug.h>
 
-/* GLOBALS *******************************************************************/
+/* GLOBALS ********************************************************************/
 
 static unsigned ApiDefinitionsCount = 0;
 static PCSRSS_API_DEFINITION ApiDefinitions = NULL;
@@ -25,7 +25,7 @@ volatile LONG CsrpStaticThreadCount;
 volatile LONG CsrpDynamicThreadTotal;
 extern ULONG CsrMaxApiRequestThreads;
 
-/* FUNCTIONS *****************************************************************/
+/* FUNCTIONS ******************************************************************/
 
 #if 0
 NTSTATUS FASTCALL
diff --git a/subsystems/win32/csrsrv/server.c b/subsystems/win32/csrsrv/server.c
index 4d1058ae447..57592aad747 100644
--- a/subsystems/win32/csrsrv/server.c
+++ b/subsystems/win32/csrsrv/server.c
@@ -6,14 +6,14 @@
  * PROGRAMMERS:     Alex Ionescu (alex@relsoft.net)
  */
 
-/* INCLUDES ******************************************************************/
+/* INCLUDES *******************************************************************/
 
 #include "srv.h"
 
 #define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
+/* DATA ***********************************************************************/
 
 PCSR_API_ROUTINE CsrServerApiDispatchTable[CsrpMaxApiNumber] =
 {
@@ -49,7 +49,7 @@ PVOID *CsrSrvSharedStaticServerData;
 ULONG CsrSrvSharedSectionSize;
 HANDLE CsrSrvSharedSection;
 
-/* PRIVATE FUNCTIONS**********************************************************/
+/* PRIVATE FUNCTIONS **********************************************************/
 
 /*++
  * @name CsrServerDllInitialization
@@ -583,7 +583,7 @@ CsrSrvUnusedFunction(IN OUT PCSR_API_MESSAGE ApiMessage,
     return STATUS_INVALID_PARAMETER;
 }
 
-/* PUBLIC FUNCTIONS***********************************************************/
+/* PUBLIC FUNCTIONS ***********************************************************/
 
 /*++
  * @name CsrSetCallingSpooler
diff --git a/subsystems/win32/csrsrv/session.c b/subsystems/win32/csrsrv/session.c
index 793efe91e91..ad53c79a762 100644
--- a/subsystems/win32/csrsrv/session.c
+++ b/subsystems/win32/csrsrv/session.c
@@ -6,14 +6,14 @@
  * PROGRAMMERS:     Alex Ionescu (alex@relsoft.net)
  */
 
-/* INCLUDES ******************************************************************/
+/* INCLUDES *******************************************************************/
 
 #include "srv.h"
 
 #define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
+/* DATA ***********************************************************************/
 
 RTL_CRITICAL_SECTION CsrNtSessionLock;
 LIST_ENTRY CsrNtSessionList;
@@ -37,7 +37,7 @@ PCHAR CsrServerSbApiName[5] =
     "Unknown Csr Sb Api Number"
 };
 
-/* PRIVATE FUNCTIONS *********************************************************/
+/* PRIVATE FUNCTIONS **********************************************************/
 
 /*++
  * @name CsrInitializeNtSessionList
@@ -191,7 +191,7 @@ CsrDereferenceNtSession(IN PCSR_NT_SESSION Session,
     }
 }
 
-/* SESSION MANAGER FUNCTIONS**************************************************/
+/* SESSION MANAGER FUNCTIONS **************************************************/
 
 /*++
  * @name CsrSbCreateSession
diff --git a/subsystems/win32/csrsrv/wait.c b/subsystems/win32/csrsrv/wait.c
index 91e0d0dee31..571bc241172 100644
--- a/subsystems/win32/csrsrv/wait.c
+++ b/subsystems/win32/csrsrv/wait.c
@@ -7,18 +7,18 @@
  *                  Alex Ionescu (alex@relsoft.net)
  */
 
-/* INCLUDES ******************************************************************/
+/* INCLUDES *******************************************************************/
 
 #include "srv.h"
 
 #define NDEBUG
 #include <debug.h>
 
-/* DATA **********************************************************************/
+/* DATA ***********************************************************************/
 
 RTL_CRITICAL_SECTION CsrWaitListsLock;
 
-/* PRIVATE FUNCTIONS *********************************************************/
+/* PRIVATE FUNCTIONS **********************************************************/
 
 /*++
  * @name CsrInitializeWait
@@ -183,7 +183,7 @@ CsrNotifyWaitBlock(IN PCSR_WAIT_BLOCK WaitBlock,
     return FALSE;
 }
 
-/* PUBLIC FUNCTIONS **********************************************************/
+/* PUBLIC FUNCTIONS ***********************************************************/
 
 /*++
  * @name CsrCreateWait