From 802aa6f2b70cc0b4e69ef0a1dcab0a8d68a0fdea Mon Sep 17 00:00:00 2001
From: David Lawrence <source@isc.org>
Date: Tue, 25 Apr 2000 22:32:26 +0000
Subject: [PATCH]   87.   [cleanup]       <isc/heap.h> does not need
 <isc/boolean.h>,                         <isc/mem.h> or <isc/result.h>. (...
 and now heap.c needs <isc/mem.h>.)

---
 CHANGES                    | 3 +++
 lib/isc/heap.c             | 1 +
 lib/isc/include/isc/heap.h | 4 +---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 15fbc373ab..a6acd2b39d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+  87.   [cleanup]       <isc/heap.h> does not need <isc/boolean.h>,
+                        <isc/mem.h> or <isc/result.h>.
+
   86.   [cleanup]       isc_bufferlist_t moved from <isc/bufferlist.h> to
                         <isc/types.h>.
 
diff --git a/lib/isc/heap.c b/lib/isc/heap.c
index f0b42678ef..998cab4d14 100644
--- a/lib/isc/heap.c
+++ b/lib/isc/heap.c
@@ -32,6 +32,7 @@
 
 #include <isc/assertions.h>
 #include <isc/heap.h>
+#include <isc/mem.h>
 
 /*
  * Note: to make heap_parent and heap_left easy to compute, the first
diff --git a/lib/isc/include/isc/heap.h b/lib/isc/include/isc/heap.h
index 1da78ba674..2a3b1520da 100644
--- a/lib/isc/include/isc/heap.h
+++ b/lib/isc/include/isc/heap.h
@@ -19,9 +19,7 @@
 #define ISC_HEAP_H 1
 
 #include <isc/lang.h>
-#include <isc/result.h>
-#include <isc/boolean.h>
-#include <isc/mem.h>
+#include <isc/types.h>
 
 ISC_LANG_BEGINDECLS