diff --git a/sysdeps/unix/sysv/linux/i386/sys/ucontext.h b/sysdeps/unix/sysv/linux/i386/sys/ucontext.h
index 44a5b12cd4..a90078ce9c 100644
--- a/sysdeps/unix/sysv/linux/i386/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/i386/sys/ucontext.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -26,6 +26,10 @@
    included in <signal.h>.  */
 #include <bits/sigcontext.h>
 
+/* We also need the definition of the userlevel data representation
+   for the register contexts.  */
+#include <sys/user.h>
+
 
 /* Type for general register.  */
 typedef int greg_t;
@@ -82,7 +86,7 @@ enum
 #endif
 
 /* Structure to describe FPU registers.  */
-typedef struct _fpstate *fpregset_t;
+typedef struct user_fpregs_struct fpregset_t;
 
 /* Context to describe whole processor state.  */
 typedef struct
@@ -103,7 +107,7 @@ typedef struct ucontext
     stack_t uc_stack;
     mcontext_t uc_mcontext;
     __sigset_t uc_sigmask;
-    struct _fpstate __fpregs_mem;
+    fpregset_t __fpregs_mem;
   } ucontext_t;
 
 #endif /* sys/ucontext.h */