diff --git a/ChangeLog b/ChangeLog
index f37370c60c..8495478e82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-06-02  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #21543]
+	* signal/signal.h: Only include <bits/types/sigevent_t.h> and
+	<bits/sigevent-consts.h> if [__USE_POSIX199309], not if
+	[__USE_XOPEN_EXTENDED].
+
 2017-06-02  Florian Weimer  <fweimer@redhat.com>
 
 	* sysdeps/posix/getaddrinfo.c (gethosts): Eliminate another
diff --git a/signal/signal.h b/signal/signal.h
index 947873ea8e..21d628dbd2 100644
--- a/signal/signal.h
+++ b/signal/signal.h
@@ -55,8 +55,11 @@ typedef __uid_t uid_t;
 
 #if defined __USE_POSIX199309 || defined __USE_XOPEN_EXTENDED
 # include <bits/types/siginfo_t.h>
-# include <bits/types/sigevent_t.h>
 # include <bits/siginfo-consts.h>
+#endif
+
+#ifdef __USE_POSIX199309
+# include <bits/types/sigevent_t.h>
 # include <bits/sigevent-consts.h>
 #endif