diff --git a/lib/isc/include/isc/buffer.h b/lib/isc/include/isc/buffer.h
index 4532d081aa..680bdf45b3 100644
--- a/lib/isc/include/isc/buffer.h
+++ b/lib/isc/include/isc/buffer.h
@@ -106,6 +106,7 @@
 #include <isc/mem.h>
 #include <isc/region.h>
 #include <isc/int.h>
+#include <isc/types.h>
 
 ISC_LANG_BEGINDECLS
 
@@ -150,7 +151,6 @@ ISC_LANG_BEGINDECLS
  * discouraged from directly manipulating the structure.
  */
 
-typedef struct isc_buffer isc_buffer_t;
 struct isc_buffer {
 	unsigned int		magic;
 	unsigned int		type;
diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h
index 16b42a918d..845ef51a19 100644
--- a/lib/isc/include/isc/types.h
+++ b/lib/isc/include/isc/types.h
@@ -44,6 +44,7 @@ typedef struct isc_rwlock		isc_rwlock_t;
 typedef struct isc_bitstring		isc_bitstring_t;
 typedef struct isc_sockaddr		isc_sockaddr_t;
 typedef struct isc_netaddr		isc_netaddr_t;
+typedef struct isc_buffer		isc_buffer_t;
 
 typedef void (*isc_taskaction_t)(isc_task_t *, isc_event_t *);