diff --git a/reactos/include/napi/teb.h b/reactos/include/napi/teb.h
index f877aae006a..4a36c16b9e8 100644
--- a/reactos/include/napi/teb.h
+++ b/reactos/include/napi/teb.h
@@ -154,6 +154,12 @@ typedef struct _GDI_TEB_BATCH
    ULONG Buffer[0x136];
 } GDI_TEB_BATCH, *PGDI_TEB_BATCH;
 
+// FIXME: Redundant definition of W32THREAD also in ntoskrnl\include\internal\ps.h
+typedef struct _W32THREAD
+{
+  PVOID MessageQueue;
+} __attribute__((packed)) W32THREAD, *PW32THREAD;
+
 typedef struct _TEB
 {
    NT_TIB Tib;                         // 00h
@@ -165,7 +171,7 @@ typedef struct _TEB
    ULONG LastErrorValue;               // 34h
    ULONG CountOfOwnedCriticalSections; // 38h
    PVOID CsrClientThread;              // 3Ch
-   PVOID Win32ThreadInfo;              // 40h
+   PW32THREAD Win32ThreadInfo;         // 40h
    ULONG Win32ClientInfo[0x1F];        // 44h
    PVOID WOW32Reserved;                // C0h
    ULONG CurrentLocale;                // C4h
diff --git a/reactos/ntoskrnl/include/internal/ps.h b/reactos/ntoskrnl/include/internal/ps.h
index 0f88a58aed4..63aea96d79a 100644
--- a/reactos/ntoskrnl/include/internal/ps.h
+++ b/reactos/ntoskrnl/include/internal/ps.h
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: ps.h,v 1.26 2001/09/07 21:36:48 ea Exp $
+/* $Id: ps.h,v 1.27 2001/11/24 14:08:54 jfilby Exp $
  *
  * FILE:            ntoskrnl/ke/kthread.c
  * PURPOSE:         Process manager definitions
@@ -51,6 +51,7 @@
 #ifndef __ASM__
 
 #include <internal/mm.h>
+#include <napi/teb.h>
 
 struct _KTHREAD;
 struct _KTRAPFRAME;
@@ -235,12 +236,6 @@ typedef struct
 } PS_IMPERSONATION_INFO, *PPS_IMPERSONATION_INFO;
 
 
-typedef struct _W32THREAD
-{
-  PVOID MessageQueue;
-} __attribute__((packed)) W32THREAD, *PW32THREAD;
-
-
 typedef struct _ETHREAD
 {
   KTHREAD Tcb;                                      /* 000 */