diff --git a/CHANGES b/CHANGES
index 38387ab2b7..8f5b16f5a4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+ 122.   [cleanup]       <isc/task.h> does not need <isc/mem.h> or
+                        <isc/result.h>.
+
  121.   [cleanup]       <isc/symtab.h> does not need <isc/mem.h> or
                         <isc/result.h>.  Multiple inclusion protection
                         symbol fixed from ISC_SYMBOL_H to ISC_SYMTAB_H.
diff --git a/lib/isc/include/isc/task.h b/lib/isc/include/isc/task.h
index 7566f53a72..cd032a6f9c 100644
--- a/lib/isc/include/isc/task.h
+++ b/lib/isc/include/isc/task.h
@@ -59,10 +59,6 @@
 #include <isc/lang.h>
 #include <isc/types.h>
 #include <isc/eventclass.h>
-#include <isc/mem.h>
-#include <isc/result.h>
-
-ISC_LANG_BEGINDECLS
 
 #define ISC_TASKEVENT_FIRSTEVENT	(ISC_EVENTCLASS_TASK + 0)
 #define ISC_TASKEVENT_SHUTDOWN		(ISC_EVENTCLASS_TASK + 1)
@@ -72,6 +68,8 @@ ISC_LANG_BEGINDECLS
  ***** Tasks.
  *****/
 
+ISC_LANG_BEGINDECLS
+
 isc_result_t
 isc_task_create(isc_taskmgr_t *manager, unsigned int quantum,
 		isc_task_t **taskp);
diff --git a/lib/isc/task.c b/lib/isc/task.c
index efac3ee5c3..f2c8a4c8fb 100644
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -30,12 +30,13 @@
 
 #include <isc/assertions.h>
 #include <isc/boolean.h>
-#include <isc/thread.h>
-#include <isc/mutex.h>
 #include <isc/condition.h>
 #include <isc/error.h>
 #include <isc/event.h>
+#include <isc/mem.h>
+#include <isc/mutex.h>
 #include <isc/task.h>
+#include <isc/thread.h>
 #include <isc/util.h>
 
 #define ISC_TASK_NAMES 1
diff --git a/lib/isc/taskpool.c b/lib/isc/taskpool.c
index 092112a344..743237555d 100644
--- a/lib/isc/taskpool.c
+++ b/lib/isc/taskpool.c
@@ -20,7 +20,9 @@
 #include <isc/assertions.h>
 #include <isc/boolean.h>
 #include <isc/error.h>
+#include <isc/mem.h>
 #include <isc/taskpool.h>
+#include <isc/result.h>
 #include <isc/util.h>
 
 /***
diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index 2983446bb6..f692c0ea5b 100644
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -21,12 +21,13 @@
 #include <stdlib.h>
 
 #include <isc/assertions.h>
-#include <isc/error.h>
-#include <isc/thread.h>
-#include <isc/mutex.h>
 #include <isc/condition.h>
+#include <isc/error.h>
 #include <isc/heap.h>
+#include <isc/mem.h>
+#include <isc/mutex.h>
 #include <isc/task.h>
+#include <isc/thread.h>
 #include <isc/timer.h>
 #include <isc/util.h>