diff --git a/ChangeLog b/ChangeLog
index df089f0cf9..9ea007a669 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2016-10-04  Tulio Magno Quites Machado Filho  <tuliom@linux.vnet.ibm.com>
+
+	* sysdeps/powerpc/sys/platform/ppc.h (__ppc_get_timebase): Replace
+	inline by __inline__.
+	(__ppc_yield, __ppc_mdoio, __ppc_mdoom, __ppc_set_ppr_med): Likewise.
+	(__ppc_set_ppr_med_low, __ppc_set_ppr_low): Likewise.
+	(__ppc_set_ppr_very_low, __ppc_set_ppr_med_high): Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h: Require
+	sigset_t from signal.h.
+	* sysdeps/unix/sysv/linux/powerpc/sys/user.h: Include stddef.h,
+	which is already required.
+
 2016-10-04  Stefan Liebler  <stli@linux.vnet.ibm.com>
 
 	* sysdeps/s390/fpu/libm-test-ulps: Regenerated.
diff --git a/sysdeps/powerpc/sys/platform/ppc.h b/sysdeps/powerpc/sys/platform/ppc.h
index 4d8a41165b..bf6ee31296 100644
--- a/sysdeps/powerpc/sys/platform/ppc.h
+++ b/sysdeps/powerpc/sys/platform/ppc.h
@@ -24,7 +24,7 @@
 #include <bits/ppc.h>
 
 /* Read the Time Base Register.   */
-static inline uint64_t
+static __inline__ uint64_t
 __ppc_get_timebase (void)
 {
 #if __GNUC_PREREQ (4, 8)
@@ -56,7 +56,7 @@ __ppc_get_timebase (void)
 /* Provides a hint that performance will probably be improved if shared
    resources dedicated to the executing processor are released for use by other
    processors.  */
-static inline void
+static __inline__ void
 __ppc_yield (void)
 {
   __asm__ volatile ("or 27,27,27");
@@ -66,7 +66,7 @@ __ppc_yield (void)
    resources dedicated to the executing processor are released until
    all outstanding storage accesses to caching-inhibited storage have been
    completed.  */
-static inline void
+static __inline__ void
 __ppc_mdoio (void)
 {
   __asm__ volatile ("or 29,29,29");
@@ -76,7 +76,7 @@ __ppc_mdoio (void)
    resources dedicated to the executing processor are released until all
    outstanding storage accesses to cacheable storage for which the data is not
    in the cache have been completed.  */
-static inline void
+static __inline__ void
 __ppc_mdoom (void)
 {
   __asm__ volatile ("or 30,30,30");
@@ -94,19 +94,19 @@ __ppc_mdoom (void)
    use unguarded. The default value is 'medium'.
  */
 
-static inline void
+static __inline__ void
 __ppc_set_ppr_med (void)
 {
   __asm__ volatile ("or 2,2,2");
 }
 
-static inline void
+static __inline__ void
 __ppc_set_ppr_med_low (void)
 {
   __asm__ volatile ("or 6,6,6");
 }
 
-static inline void
+static __inline__ void
 __ppc_set_ppr_low (void)
 {
   __asm__ volatile ("or 1,1,1");
@@ -129,13 +129,13 @@ __ppc_set_ppr_low (void)
 
 #ifdef _ARCH_PWR8
 
-static inline void
+static __inline__ void
 __ppc_set_ppr_very_low (void)
 {
   __asm__ volatile ("or 31,31,31");
 }
 
-static inline void
+static __inline__ void
 __ppc_set_ppr_med_high (void)
 {
   __asm__ volatile ("or 5,5,5");
diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h b/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h
index c4634f68b5..e40bced8c5 100644
--- a/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h
@@ -19,6 +19,7 @@
 #define _SYS_UCONTEXT_H	1
 
 #include <features.h>
+#define __need_sigset_t
 #include <signal.h>
 
 /* We need the signal context definitions even if they are not exposed
diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/user.h b/sysdeps/unix/sysv/linux/powerpc/sys/user.h
index 97459fba80..4f2ebc2535 100644
--- a/sysdeps/unix/sysv/linux/powerpc/sys/user.h
+++ b/sysdeps/unix/sysv/linux/powerpc/sys/user.h
@@ -18,6 +18,7 @@
 #ifndef _SYS_USER_H
 
 #define _SYS_USER_H	1
+#include <stddef.h>
 #include <features.h>
 
 #include <asm/ptrace.h>