diff --git a/libjava/include/i386-signal.h b/libjava/include/i386-signal.h
--- a/libjava/include/i386-signal.h.ORIG	2011-12-20 13:18:26.524825000 +0100
+++ b/libjava/include/i386-signal.h	2017-10-16 13:48:47.399142575 +0200
@@ -29,7 +29,7 @@
 #define HANDLE_DIVIDE_OVERFLOW						\
 do									\
 {									\
-  struct ucontext *_uc = (struct ucontext *)_p;				\
+  ucontext_t *_uc = (ucontext_t *)_p;					\
   gregset_t &_gregs = _uc->uc_mcontext.gregs;				\
   unsigned char *_eip = (unsigned char *)_gregs[REG_EIP];		\
 									\
diff --git a/libjava/include/s390-signal.h b/libjava/include/s390-signal.h
--- a/libjava/include/s390-signal.h
+++ b/libjava/include/s390-signal.h
@@ -51,7 +51,7 @@ do                                                                    \
   struct                                                                \
   {                                                                     \
     unsigned long int uc_flags;                                         \
-    struct ucontext *uc_link;                                           \
+    ucontext_t *uc_link;                                                \
     stack_t uc_stack;                                                   \
     mcontext_t uc_mcontext;                                             \
     unsigned long sigmask[2];                                           \
diff --git a/libjava/include/sh-signal.h b/libjava/include/sh-signal.h
index 3a96ce2..e400ff5 100644
--- a/libjava/include/sh-signal.h
+++ b/libjava/include/sh-signal.h
@@ -21,7 +21,7 @@ details.  */
 
 /* The third parameter to the signal handler points to something with
  * this structure defined in asm/ucontext.h, but the name clashes with
- * struct ucontext from sys/ucontext.h so this private copy is used.  */
+ * ucontext_t from sys/ucontext.h so this private copy is used.  */
 typedef struct _sig_ucontext {
   unsigned long uc_flags;
   struct _sig_ucontext *uc_link;
diff --git a/libjava/include/x86_64-signal.h b/libjava/include/x86_64-signal.h
--- a/libjava/include/x86_64-signal.h.ORIG	2013-01-04 13:49:55.235780000 +0100
+++ b/libjava/include/x86_64-signal.h	2017-10-16 13:49:57.409145204 +0200
@@ -28,7 +28,7 @@
 #define HANDLE_DIVIDE_OVERFLOW						\
 do									\
 {									\
-  struct ucontext *_uc = (struct ucontext *)_p;				\
+  ucontext_t *_uc = (ucontext_t *)_p;					\
   gregset_t &_gregs = _uc->uc_mcontext.gregs;				\
   unsigned char *_rip = (unsigned char *)_gregs[REG_RIP];		\
 									\