diff --git a/win32ss/user/winsrv/consrv/alias.c b/win32ss/user/winsrv/consrv/alias.c
index 273c097b08e..a3a39cae48c 100644
--- a/win32ss/user/winsrv/consrv/alias.c
+++ b/win32ss/user/winsrv/consrv/alias.c
@@ -474,7 +474,8 @@ CSR_API(SrvAddConsoleAlias)
 
     lpTarget = (ConsoleAliasRequest->TargetLength != 0 ? ConsoleAliasRequest->Target : NULL);
 
-    Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE);
+    Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
+                              &Console, TRUE);
     if (!NT_SUCCESS(Status)) return Status;
 
     Status = STATUS_SUCCESS;
@@ -570,7 +571,8 @@ CSR_API(SrvGetConsoleAlias)
         return STATUS_INVALID_PARAMETER;
     }
 
-    Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE);
+    Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
+                              &Console, TRUE);
     if (!NT_SUCCESS(Status)) return Status;
 
     Header = IntFindAliasHeader(Console,
@@ -647,7 +649,8 @@ CSR_API(SrvGetConsoleAliases)
         return STATUS_INVALID_PARAMETER;
     }
 
-    Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE);
+    Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
+                              &Console, TRUE);
     if (!NT_SUCCESS(Status)) return Status;
 
     Header = IntFindAliasHeader(Console,
@@ -747,7 +750,8 @@ CSR_API(SrvGetConsoleAliasesLength)
         return STATUS_INVALID_PARAMETER;
     }
 
-    Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE);
+    Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
+                              &Console, TRUE);
     if (!NT_SUCCESS(Status)) return Status;
 
     Header = IntFindAliasHeader(Console,
@@ -787,7 +791,8 @@ CSR_API(SrvGetConsoleAliasExes)
         return STATUS_INVALID_PARAMETER;
     }
 
-    Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE);
+    Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
+                              &Console, TRUE);
     if (!NT_SUCCESS(Status)) return Status;
 
     if (IntGetConsoleAliasesExesLength(Console->Aliases, GetAliasesExesRequest->Unicode) > GetAliasesExesRequest->Length)
@@ -864,7 +869,8 @@ CSR_API(SrvGetConsoleAliasExesLength)
 
     DPRINT1("SrvGetConsoleAliasExesLength entered ApiMessage %p\n", ApiMessage);
 
-    Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE);
+    Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process),
+                              &Console, TRUE);
     if (!NT_SUCCESS(Status)) return Status;
 
     GetAliasesExesLengthRequest->Length =
diff --git a/win32ss/user/winsrv/consrv/frontends/terminal.c b/win32ss/user/winsrv/consrv/frontends/terminal.c
index c617322f7bd..30ad25c6e08 100644
--- a/win32ss/user/winsrv/consrv/frontends/terminal.c
+++ b/win32ss/user/winsrv/consrv/frontends/terminal.c
@@ -137,7 +137,7 @@ NTSTATUS (NTAPI *FRONTEND_UNLOAD)(IN OUT PFRONTEND FrontEnd);
  * NOTE: Each entry of the table should be retrieved when loading a front-end
  *       (examples of the CSR servers which register some data for CSRSS).
  */
-struct
+static struct
 {
     CHAR            FrontEndName[80];
     FRONTEND_LOAD   FrontEndLoad;
diff --git a/win32ss/user/winsrv/consrv/include/conio.h b/win32ss/user/winsrv/consrv/include/conio.h
index 81a6f9f7585..2c51e721729 100644
--- a/win32ss/user/winsrv/consrv/include/conio.h
+++ b/win32ss/user/winsrv/consrv/include/conio.h
@@ -300,13 +300,14 @@ struct _CONSOLE;
 typedef struct _CONSOLE
 {
 /******************************* Console Set-up *******************************/
-    LONG ReferenceCount;                    /* Is incremented each time a handle to something in the console (a screen-buffer or the input buffer of this console) gets referenced */
-    CRITICAL_SECTION Lock;
 
 #ifndef USE_NEW_CONSOLE_WAY
-    /**/WINSRV_CONSOLE;/**/ // HACK HACK!!
+    WINSRV_CONSOLE; // HACK HACK!!
 #endif
 
+    LONG ReferenceCount;                    /* Is incremented each time a handle to something in the console (a screen-buffer or the input buffer of this console) gets referenced */
+    CRITICAL_SECTION Lock;
+
     CONSOLE_STATE State;                    /* State of the console */
     TERMINAL TermIFace;                     /* Frontend-specific interface */
 
diff --git a/win32ss/user/winsrv/consrv/include/conio_winsrv.h b/win32ss/user/winsrv/consrv/include/conio_winsrv.h
index 1291a57a7c9..36f94462f24 100644
--- a/win32ss/user/winsrv/consrv/include/conio_winsrv.h
+++ b/win32ss/user/winsrv/consrv/include/conio_winsrv.h
@@ -131,7 +131,8 @@ typedef struct _WINSRV_CONSOLE
     /* This **MUST** be FIRST!! */
 #ifdef USE_NEW_CONSOLE_WAY
     CONSOLE;
-    // PCONSOLE Console;
+    // CONSOLE Console;
+    // // PCONSOLE Console;
 #endif
 
     // LONG ReferenceCount;                    /* Is incremented each time a handle to something in the console (a screen-buffer or the input buffer of this console) gets referenced */
diff --git a/win32ss/user/winsrv/consrv/procinit.h b/win32ss/user/winsrv/consrv/procinit.h
index 493415156eb..5ceca6a25b1 100644
--- a/win32ss/user/winsrv/consrv/procinit.h
+++ b/win32ss/user/winsrv/consrv/procinit.h
@@ -9,14 +9,14 @@
 #pragma once
 
 NTSTATUS ConSrvAllocateConsole(PCONSOLE_PROCESS_DATA ProcessData,
-                                        PHANDLE pInputHandle,
-                                        PHANDLE pOutputHandle,
-                                        PHANDLE pErrorHandle,
-                                        PCONSOLE_START_INFO ConsoleStartInfo);
+                               PHANDLE pInputHandle,
+                               PHANDLE pOutputHandle,
+                               PHANDLE pErrorHandle,
+                               PCONSOLE_START_INFO ConsoleStartInfo);
 NTSTATUS ConSrvInheritConsole(PCONSOLE_PROCESS_DATA ProcessData,
-                                       HANDLE ConsoleHandle,
-                                       BOOLEAN CreateNewHandlesTable,
-                                       PHANDLE pInputHandle,
-                                       PHANDLE pOutputHandle,
-                                       PHANDLE pErrorHandle);
+                              HANDLE ConsoleHandle,
+                              BOOLEAN CreateNewHandlesTable,
+                              PHANDLE pInputHandle,
+                              PHANDLE pOutputHandle,
+                              PHANDLE pErrorHandle);
 VOID ConSrvRemoveConsole(PCONSOLE_PROCESS_DATA ProcessData);