diff --git a/ChangeLog b/ChangeLog
index f2d2b3115c..80033f9d3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2000-02-19  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/i386/sys/ucontext.h: Add definition of
-	_fpreg and _fpstate and use it to define fpregset_t.
+	_libc_fpreg and _libc_fpstate and use it to define fpregset_t.
 	* sysdeps/unix/sysv/linux/i386/sys/procfs.h (prgregset_t): Define
 	using elf_gregset_t.
 	(prfpregset_t): Define using elf_fpregset_t.
diff --git a/sysdeps/unix/sysv/linux/i386/sys/procfs.h b/sysdeps/unix/sysv/linux/i386/sys/procfs.h
index 230dfa6c30..b54f4722c5 100644
--- a/sysdeps/unix/sysv/linux/i386/sys/procfs.h
+++ b/sysdeps/unix/sysv/linux/i386/sys/procfs.h
@@ -101,8 +101,8 @@ struct elf_prpsinfo
 typedef void *psaddr_t;
 
 /* Register sets.  Linux has different names.  */
-typedef gregset_t prgregset_t;
-typedef fpregset_t *prfpregset_t;
+typedef elf_gregset_t prgregset_t;
+typedef elf_fpregset_t *prfpregset_t;
 
 /* We don't have any differences between processes and threads,
    therefore habe only ine PID type.  */
diff --git a/sysdeps/unix/sysv/linux/i386/sys/ucontext.h b/sysdeps/unix/sysv/linux/i386/sys/ucontext.h
index c2a657b8cc..89264111d4 100644
--- a/sysdeps/unix/sysv/linux/i386/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/i386/sys/ucontext.h
@@ -86,13 +86,13 @@ enum
 #endif
 
 /* Definitions taken from the kernel headers.  */
-struct _fpreg
+struct _libc_fpreg
 {
   unsigned short int significand[4];
   unsigned short int exponent;
 };
 
-struct _fpstate
+struct _libc_fpstate
 {
   unsigned long int cw;
   unsigned long int sw;
@@ -101,12 +101,12 @@ struct _fpstate
   unsigned long int cssel;
   unsigned long int dataoff;
   unsigned long int datasel;
-  struct _fpreg _st[8];
+  struct _libc_fpreg _st[8];
   unsigned long int status;
 };
 
 /* Structure to describe FPU registers.  */
-typedef struct _fpstate *fpregset_t;
+typedef struct _libc_fpstate *fpregset_t;
 
 /* Context to describe whole processor state.  */
 typedef struct
@@ -127,7 +127,7 @@ typedef struct ucontext
     stack_t uc_stack;
     mcontext_t uc_mcontext;
     __sigset_t uc_sigmask;
-    struct _fpstate __fpregs_mem;
+    struct _libc_fpstate __fpregs_mem;
   } ucontext_t;
 
 #endif /* sys/ucontext.h */