diff --git a/reactos/include/ddk/psfuncs.h b/reactos/include/ddk/psfuncs.h
index d4a804995c8..b4e80b52849 100644
--- a/reactos/include/ddk/psfuncs.h
+++ b/reactos/include/ddk/psfuncs.h
@@ -1,4 +1,4 @@
-/* $Id: psfuncs.h,v 1.18 2002/01/03 17:58:44 ekohl Exp $
+/* $Id: psfuncs.h,v 1.19 2002/01/26 21:22:48 dwelch Exp $
  */
 #ifndef _INCLUDE_DDK_PSFUNCS_H
 #define _INCLUDE_DDK_PSFUNCS_H
@@ -44,7 +44,7 @@ VOID STDCALL PsEstablishWin32Callouts(PVOID Param1,
 				      PVOID Param2,
 				      PVOID Param3,
 				      PVOID Param4,
-				      PVOID Param5,
+				      ULONG W32ThreadSize,
 				      ULONG W32ProcessSize);
 
 struct _ETHREAD* STDCALL PsGetCurrentThread(VOID);
diff --git a/reactos/include/napi/teb.h b/reactos/include/napi/teb.h
index e3d73e6e278..1bbc44d24e1 100644
--- a/reactos/include/napi/teb.h
+++ b/reactos/include/napi/teb.h
@@ -154,14 +154,6 @@ typedef struct _GDI_TEB_BATCH
    ULONG Buffer[0x136];
 } GDI_TEB_BATCH, *PGDI_TEB_BATCH;
 
-typedef struct _W32THREAD
-{
-  PVOID MessageQueue;
-} __attribute__((packed)) W32THREAD, *PW32THREAD;
-
-PW32THREAD STDCALL
-PsGetWin32Thread(VOID);
-
 typedef struct _TEB
 {
    NT_TIB Tib;                         // 00h
@@ -173,7 +165,7 @@ typedef struct _TEB
    ULONG LastErrorValue;               // 34h
    ULONG CountOfOwnedCriticalSections; // 38h
    PVOID CsrClientThread;              // 3Ch
-   PW32THREAD Win32ThreadInfo;         // 40h
+   struct _W32THREAD* Win32ThreadInfo;         // 40h
    ULONG Win32ClientInfo[0x1F];        // 44h
    PVOID WOW32Reserved;                // C0h
    ULONG CurrentLocale;                // C4h
diff --git a/reactos/include/win32k/ntuser.h b/reactos/include/win32k/ntuser.h
index f95e001345c..73655d34908 100644
--- a/reactos/include/win32k/ntuser.h
+++ b/reactos/include/win32k/ntuser.h
@@ -533,14 +533,12 @@ STDCALL
 NtUserGetCaretPos(
   DWORD Unknown0);
 
-DWORD
-STDCALL
-NtUserGetClassInfo(
-  DWORD Unknown0,
-  DWORD Unknown1,
-  DWORD Unknown2,
-  DWORD Unknown3,
-  DWORD Unknown4);
+DWORD STDCALL
+NtUserGetClassInfo(IN LPWSTR ClassName,
+		   IN ULONG InfoClass,
+		   OUT PVOID Info,
+		   IN ULONG InfoLength,
+		   OUT PULONG ReturnedLength);
 
 DWORD
 STDCALL