diff --git a/CHANGES b/CHANGES
index 949d6da5c0..3544f464a1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+  85.   [cleanup]       <isc/bufferlist.h> does not need <isc/mem.h>,
+                        <isc/region.h> or <isc/int.h>.
 
   84.	[func]		allow-query ACL checks now apply to all data
 			added to a response.
diff --git a/lib/isc/bufferlist.c b/lib/isc/bufferlist.c
index 3fa9e16b80..bda69196a6 100644
--- a/lib/isc/bufferlist.c
+++ b/lib/isc/bufferlist.c
@@ -17,14 +17,15 @@
 
 #include <config.h>
 
+#include <stddef.h>
+
 #include <isc/assertions.h>
 #include <isc/buffer.h>
 #include <isc/bufferlist.h>
 #include <isc/list.h>
 
 unsigned int
-isc_bufferlist_usedcount(isc_bufferlist_t *bl)
-{
+isc_bufferlist_usedcount(isc_bufferlist_t *bl) {
 	isc_buffer_t *buffer;
 	unsigned int length;
 
@@ -42,8 +43,7 @@ isc_bufferlist_usedcount(isc_bufferlist_t *bl)
 }
 
 unsigned int
-isc_bufferlist_availablecount(isc_bufferlist_t *bl)
-{
+isc_bufferlist_availablecount(isc_bufferlist_t *bl) {
 	isc_buffer_t *buffer;
 	unsigned int length;
 
diff --git a/lib/isc/include/isc/bufferlist.h b/lib/isc/include/isc/bufferlist.h
index b69be760fa..405a16fb59 100644
--- a/lib/isc/include/isc/bufferlist.h
+++ b/lib/isc/include/isc/bufferlist.h
@@ -45,9 +45,6 @@
 #include <isc/lang.h>
 #include <isc/buffer.h>
 #include <isc/list.h>
-#include <isc/mem.h>
-#include <isc/region.h>
-#include <isc/int.h>
 
 ISC_LANG_BEGINDECLS