diff --git a/CHANGES b/CHANGES
index 8f5b16f5a4..e007a599ef 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+ 123.   [cleanup]       <isc/event.h> does not need <stddef.h>.
+
  122.   [cleanup]       <isc/task.h> does not need <isc/mem.h> or
                         <isc/result.h>.
 
diff --git a/lib/isc/include/isc/event.h b/lib/isc/include/isc/event.h
index 885ebefb0b..a7b03c39b2 100644
--- a/lib/isc/include/isc/event.h
+++ b/lib/isc/include/isc/event.h
@@ -18,13 +18,9 @@
 #ifndef ISC_EVENT_H
 #define ISC_EVENT_H 1
 
-#include <stddef.h>
-
 #include <isc/lang.h>
 #include <isc/types.h>
 
-ISC_LANG_BEGINDECLS
-
 /*****
  ***** Events.
  *****/
@@ -93,13 +89,14 @@ struct isc_event {
 #define ISC_EVENTTYPE_FIRSTEVENT	0x00000000
 #define ISC_EVENTTYPE_LASTEVENT		0xffffffff
 
-isc_event_t *				isc_event_allocate(isc_mem_t *,
-							   void *,
-							   isc_eventtype_t,
-							   isc_taskaction_t,
-							   void *arg,
-							   size_t);
-void					isc_event_free(isc_event_t **);
+ISC_LANG_BEGINDECLS
+
+isc_event_t *
+isc_event_allocate(isc_mem_t *, void *, isc_eventtype_t, isc_taskaction_t,
+		   void *arg, size_t);
+
+void
+isc_event_free(isc_event_t **);
 
 ISC_LANG_ENDDECLS
 
diff --git a/lib/isc/ondestroy.c b/lib/isc/ondestroy.c
index a71e6e6b36..bfa2f9da24 100644
--- a/lib/isc/ondestroy.c
+++ b/lib/isc/ondestroy.c
@@ -17,6 +17,8 @@
 
 #include <config.h>
 
+#include <stddef.h>
+
 #include <isc/assertions.h>
 #include <isc/event.h>
 #include <isc/ondestroy.h>
@@ -33,10 +35,9 @@ isc_ondestroy_init(isc_ondestroy_t *ondest) {
 	ISC_LIST_INIT(ondest->events);
 }
 
-
 isc_result_t
-isc_ondestroy_register(isc_ondestroy_t *ondest,
-		       isc_task_t *task, isc_event_t **eventp)
+isc_ondestroy_register(isc_ondestroy_t *ondest, isc_task_t *task,
+		       isc_event_t **eventp)
 {
 	isc_event_t *theevent;
 	isc_task_t *thetask = NULL;
@@ -58,8 +59,6 @@ isc_ondestroy_register(isc_ondestroy_t *ondest,
 	return (ISC_R_SUCCESS);
 }
 
-
-
 void
 isc_ondestroy_notify(isc_ondestroy_t *ondest, void *sender) {
 	isc_event_t *eventp;