diff --git a/win32ss/user/consrv/console.h b/win32ss/user/consrv/console.h
index e7ea78360f5..3a802671581 100644
--- a/win32ss/user/consrv/console.h
+++ b/win32ss/user/consrv/console.h
@@ -10,14 +10,14 @@
 
 VOID WINAPI ConSrvInitConsoleSupport(VOID);
 
-NTSTATUS WINAPI ConSrvInitConsole(OUT PCONSOLE* NewConsole,
+NTSTATUS WINAPI ConSrvInitConsole(OUT struct _CONSOLE** /* PCONSOLE* */ NewConsole,
                                   IN OUT PCONSOLE_START_INFO ConsoleStartInfo,
                                   IN PCSR_PROCESS ConsoleLeaderProcess);
-VOID WINAPI ConSrvDeleteConsole(PCONSOLE Console);
+VOID WINAPI ConSrvDeleteConsole(struct _CONSOLE* /* PCONSOLE */ Console);
 NTSTATUS FASTCALL ConSrvGetConsole(PCONSOLE_PROCESS_DATA ProcessData,
-                                   PCONSOLE* Console,
+                                   struct _CONSOLE** /* PCONSOLE* */ Console,
                                    BOOL LockConsole);
-VOID FASTCALL ConSrvReleaseConsole(PCONSOLE Console,
+VOID FASTCALL ConSrvReleaseConsole(struct _CONSOLE* /* PCONSOLE */ Console,
                                    BOOL WasConsoleLocked);
 
 /* EOF */
diff --git a/win32ss/user/consrv/consrv.h b/win32ss/user/consrv/consrv.h
index 28596537824..de845f42e5a 100644
--- a/win32ss/user/consrv/consrv.h
+++ b/win32ss/user/consrv/consrv.h
@@ -49,10 +49,6 @@
 extern HINSTANCE ConSrvDllInstance;
 extern HANDLE ConSrvHeap;
 
-/* Opaque pointers */
-typedef struct _CONSOLE_IO_HANDLE *PCONSOLE_IO_HANDLE;
-typedef struct _CONSOLE *PCONSOLE;
-
 #define ConsoleGetPerProcessData(Process)   \
     ((PCONSOLE_PROCESS_DATA)((Process)->ServerData[CONSRV_SERVERDLL_INDEX]))
 
@@ -61,14 +57,14 @@ typedef struct _CONSOLE_PROCESS_DATA
     LIST_ENTRY ConsoleLink;
     PCSR_PROCESS Process;   // Process owning this structure.
     HANDLE ConsoleEvent;
-    PCONSOLE Console;
-    PCONSOLE ParentConsole;
+    struct _CONSOLE* /* PCONSOLE */ Console;
+    struct _CONSOLE* /* PCONSOLE */ ParentConsole;
 
     BOOL ConsoleApp;    // TRUE if it is a CUI app, FALSE otherwise.
 
     RTL_CRITICAL_SECTION HandleTableLock;
     ULONG HandleTableSize;
-    PCONSOLE_IO_HANDLE HandleTable; // Length-varying table
+    struct _CONSOLE_IO_HANDLE* /* PCONSOLE_IO_HANDLE */ HandleTable; // Length-varying table
 
     LPTHREAD_START_ROUTINE CtrlDispatcher;
     LPTHREAD_START_ROUTINE PropDispatcher; // We hold the property dialog handler there, till all the GUI thingie moves out from CSRSS.
diff --git a/win32ss/user/consrv/include/conio.h b/win32ss/user/consrv/include/conio.h
index ed755467543..a29bf69dc87 100644
--- a/win32ss/user/consrv/include/conio.h
+++ b/win32ss/user/consrv/include/conio.h
@@ -25,7 +25,7 @@ typedef enum _CONSOLE_IO_OBJECT_TYPE
 typedef struct _CONSOLE_IO_OBJECT
 {
     CONSOLE_IO_OBJECT_TYPE Type;
-    PCONSOLE Console;
+    struct _CONSOLE* /* PCONSOLE */ Console;
     LONG AccessRead, AccessWrite;
     LONG ExclusiveRead, ExclusiveWrite;
     LONG HandleCount;
@@ -88,43 +88,43 @@ typedef struct _FRONTEND_VTBL
     /*
      * Internal interface (functions called by the console server only)
      */
-    VOID (WINAPI *CleanupConsole)(PCONSOLE Console);
-    VOID (WINAPI *WriteStream)(PCONSOLE Console,
+    VOID (WINAPI *CleanupConsole)(struct _CONSOLE* Console);
+    VOID (WINAPI *WriteStream)(struct _CONSOLE* Console,
                                SMALL_RECT* Block,
                                LONG CursorStartX,
                                LONG CursorStartY,
                                UINT ScrolledLines,
                                CHAR *Buffer,
                                UINT Length);
-    VOID (WINAPI *DrawRegion)(PCONSOLE Console,
+    VOID (WINAPI *DrawRegion)(struct _CONSOLE* Console,
                               SMALL_RECT* Region);
-    BOOL (WINAPI *SetCursorInfo)(PCONSOLE Console,
+    BOOL (WINAPI *SetCursorInfo)(struct _CONSOLE* Console,
                                  PCONSOLE_SCREEN_BUFFER ScreenBuffer);
-    BOOL (WINAPI *SetScreenInfo)(PCONSOLE Console,
+    BOOL (WINAPI *SetScreenInfo)(struct _CONSOLE* Console,
                                  PCONSOLE_SCREEN_BUFFER ScreenBuffer,
                                  UINT OldCursorX,
                                  UINT OldCursorY);
-    BOOL (WINAPI *UpdateScreenInfo)(PCONSOLE Console,
+    BOOL (WINAPI *UpdateScreenInfo)(struct _CONSOLE* Console,
                                     PCONSOLE_SCREEN_BUFFER ScreenBuffer);
-    NTSTATUS (WINAPI *ResizeBuffer)(PCONSOLE Console,
+    NTSTATUS (WINAPI *ResizeBuffer)(struct _CONSOLE* Console,
                                     PCONSOLE_SCREEN_BUFFER ScreenBuffer,
                                     COORD Size);
-    VOID (WINAPI *ResizeTerminal)(PCONSOLE Console);
-    BOOL (WINAPI *ProcessKeyCallback)(PCONSOLE Console,
+    VOID (WINAPI *ResizeTerminal)(struct _CONSOLE* Console);
+    BOOL (WINAPI *ProcessKeyCallback)(struct _CONSOLE* Console,
                                       MSG* msg,
                                       BYTE KeyStateMenu,
                                       DWORD ShiftState,
                                       UINT VirtualKeyCode,
                                       BOOL Down);
-    VOID (WINAPI *RefreshInternalInfo)(PCONSOLE Console);
+    VOID (WINAPI *RefreshInternalInfo)(struct _CONSOLE* Console);
 
     /*
      * External interface (functions corresponding to the Console API)
      */
-    VOID (WINAPI *ChangeTitle)(PCONSOLE Console);
-    BOOL (WINAPI *ChangeIcon)(PCONSOLE Console,
+    VOID (WINAPI *ChangeTitle)(struct _CONSOLE* Console);
+    BOOL (WINAPI *ChangeIcon)(struct _CONSOLE* Console,
                               HICON hWindowIcon);
-    HWND (WINAPI *GetConsoleWindowHandle)(PCONSOLE Console);
+    HWND (WINAPI *GetConsoleWindowHandle)(struct _CONSOLE* Console);
 
 } FRONTEND_VTBL, *PFRONTEND_VTBL;
 
diff --git a/win32ss/user/consrv/procinit.h b/win32ss/user/consrv/procinit.h
index ddbde0b491b..a8568ab8876 100644
--- a/win32ss/user/consrv/procinit.h
+++ b/win32ss/user/consrv/procinit.h
@@ -14,7 +14,7 @@ NTSTATUS FASTCALL ConSrvAllocateConsole(PCONSOLE_PROCESS_DATA ProcessData,
                                         PHANDLE pErrorHandle,
                                         PCONSOLE_START_INFO ConsoleStartInfo);
 NTSTATUS FASTCALL ConSrvInheritConsole(PCONSOLE_PROCESS_DATA ProcessData,
-                                       PCONSOLE Console,
+                                       struct _CONSOLE* /* PCONSOLE */ Console,
                                        BOOL CreateNewHandlesTable,
                                        PHANDLE pInputHandle,
                                        PHANDLE pOutputHandle,