diff --git a/lib/isc/include/isc/assertions.h b/lib/isc/include/isc/assertions.h
index 6b0da4529d..2b414d6819 100644
--- a/lib/isc/include/isc/assertions.h
+++ b/lib/isc/include/isc/assertions.h
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: assertions.h,v 1.14 2001/01/09 21:56:42 bwelling Exp $
+ * $Id: assertions.h,v 1.15 2001/03/05 18:18:39 mayer Exp $
  */
 
 #ifndef ISC_ASSERTIONS_H
@@ -36,7 +36,7 @@ typedef enum {
 typedef void (*isc_assertioncallback_t)(const char *, int, isc_assertiontype_t,
 					const char *);
 
-extern isc_assertioncallback_t isc_assertion_failed;
+LIBISC_EXTERNAL_DATA extern isc_assertioncallback_t isc_assertion_failed;
 
 void
 isc_assertion_setcallback(isc_assertioncallback_t);
diff --git a/lib/isc/include/isc/lfsr.h b/lib/isc/include/isc/lfsr.h
index 2c7ed92f5c..9f8d0b83d3 100644
--- a/lib/isc/include/isc/lfsr.h
+++ b/lib/isc/include/isc/lfsr.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lfsr.h,v 1.9 2001/01/09 21:57:05 bwelling Exp $ */
+/* $Id: lfsr.h,v 1.10 2001/03/05 18:18:16 mayer Exp $ */
 
 #ifndef ISC_LFSR_H
 #define ISC_LFSR_H 1
@@ -57,7 +57,8 @@ ISC_LANG_BEGINDECLS
  * bit length 32 will have 2^32 unique states before repeating.
  */
 
-void isc_lfsr_init(isc_lfsr_t *lfsr, isc_uint32_t state, unsigned int bits,
+void 
+isc_lfsr_init(isc_lfsr_t *lfsr, isc_uint32_t state, unsigned int bits,
 		   isc_uint32_t tap, unsigned int count,
 		   isc_lfsrreseed_t reseed, void *arg);
 /*
@@ -77,7 +78,8 @@ void isc_lfsr_init(isc_lfsr_t *lfsr, isc_uint32_t state, unsigned int bits,
  *	tap != 0
  */
 
-void isc_lfsr_generate(isc_lfsr_t *lfsr, void *data, unsigned int count);
+void 
+isc_lfsr_generate(isc_lfsr_t *lfsr, void *data, unsigned int count);
 /*
  * Returns "count" bytes of data from the LFSR.
  *
@@ -90,7 +92,8 @@ void isc_lfsr_generate(isc_lfsr_t *lfsr, void *data, unsigned int count);
  *	count > 0.
  */
 
-void isc_lfsr_skip(isc_lfsr_t *lfsr, unsigned int skip);
+void 
+isc_lfsr_skip(isc_lfsr_t *lfsr, unsigned int skip);
 /*
  * Skip "skip" states.
  *
@@ -99,7 +102,8 @@ void isc_lfsr_skip(isc_lfsr_t *lfsr, unsigned int skip);
  *	lfsr be valid.
  */
 
-isc_uint32_t isc_lfsr_generate32(isc_lfsr_t *lfsr1, isc_lfsr_t *lfsr2);
+isc_uint32_t 
+isc_lfsr_generate32(isc_lfsr_t *lfsr1, isc_lfsr_t *lfsr2);
 /*
  * Given two LFSRs, use the current state from each to skip entries in the
  * other.  The next states are then xor'd together and returned.
diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h
index 747a549888..bcd75fd983 100644
--- a/lib/isc/include/isc/mem.h
+++ b/lib/isc/include/isc/mem.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mem.h,v 1.49 2001/02/09 19:19:17 gson Exp $ */
+/* $Id: mem.h,v 1.50 2001/03/05 18:20:24 mayer Exp $ */
 
 #ifndef ISC_MEM_H
 #define ISC_MEM_H 1
@@ -154,10 +154,12 @@ extern unsigned int isc_mem_debugging;
 #define isc_mempool_put(c, p)	isc__mempool_put((c), (p) _ISC_MEM_FILELINE)
 #endif
 
-isc_result_t isc_mem_create(size_t max_size, size_t target_size,
+isc_result_t 
+isc_mem_create(size_t max_size, size_t target_size,
 			    isc_mem_t **mctxp);
 
-isc_result_t isc_mem_createx(size_t max_size, size_t target_size,
+isc_result_t 
+isc_mem_createx(size_t max_size, size_t target_size,
 			     isc_memalloc_t memalloc, isc_memfree_t memfree,
 			     void *arg, isc_mem_t **mctxp);
 /*
@@ -181,8 +183,10 @@ isc_result_t isc_mem_createx(size_t max_size, size_t target_size,
  * Requires:
  * mctxp != NULL && *mctxp == NULL */
 
-void isc_mem_attach(isc_mem_t *, isc_mem_t **);
-void isc_mem_detach(isc_mem_t **);
+void 
+isc_mem_attach(isc_mem_t *, isc_mem_t **);
+void 
+isc_mem_detach(isc_mem_t **);
 /*
  * Attach to / detach from a memory context.
  *
@@ -196,12 +200,14 @@ void isc_mem_detach(isc_mem_t **);
  * is not destroyed while there are outstanding allocations.
  */
 
-void isc_mem_destroy(isc_mem_t **);
+void 
+isc_mem_destroy(isc_mem_t **);
 /*
  * Destroy a memory context.
  */
 
-isc_result_t isc_mem_ondestroy(isc_mem_t *ctx,
+isc_result_t 
+isc_mem_ondestroy(isc_mem_t *ctx,
 			       isc_task_t *task,
 			       isc_event_t **event);
 /*
@@ -209,27 +215,32 @@ isc_result_t isc_mem_ondestroy(isc_mem_t *ctx,
  * been successfully destroyed.
  */
 
-void isc_mem_stats(isc_mem_t *mctx, FILE *out);
+void 
+isc_mem_stats(isc_mem_t *mctx, FILE *out);
 /*
  * Print memory usage statistics for 'mctx' on the stream 'out'.
  */
 
-void isc_mem_setdestroycheck(isc_mem_t *mctx,
+void 
+isc_mem_setdestroycheck(isc_mem_t *mctx,
 			     isc_boolean_t on);
 /*
  * Iff 'on' is ISC_TRUE, 'mctx' will check for memory leaks when
  * destroyed and abort the program if any are present.
  */
 
-void isc_mem_setquota(isc_mem_t *, size_t);
-size_t isc_mem_getquota(isc_mem_t *);
+void 
+isc_mem_setquota(isc_mem_t *, size_t);
+size_t 
+isc_mem_getquota(isc_mem_t *);
 /*
  * Set/get the memory quota of 'mctx'.  This is a hard limit
  * on the amount of memory that may be allocated from mctx;
  * if it is exceeded, allocations will fail.
  */
 
-size_t isc_mem_inuse(isc_mem_t *mctx);
+size_t 
+isc_mem_inuse(isc_mem_t *mctx);
 /*
  * Get an estimate of the number of memory in use in 'mctx', in bytes.
  * This includes quantization overhead, but does not include memory
@@ -399,15 +410,23 @@ isc_mempool_setfillcount(isc_mempool_t *mpctx, unsigned int limit);
 /*
  * Pseudo-private functions for use via macros.  Do not call directly.
  */
-void *		isc__mem_get(isc_mem_t *, size_t _ISC_MEM_FLARG);
-void 		isc__mem_putanddetach(isc_mem_t **, void *,
+void *		
+isc__mem_get(isc_mem_t *, size_t _ISC_MEM_FLARG);
+void 		
+isc__mem_putanddetach(isc_mem_t **, void *,
 				      size_t _ISC_MEM_FLARG);
-void 		isc__mem_put(isc_mem_t *, void *, size_t _ISC_MEM_FLARG);
-void *		isc__mem_allocate(isc_mem_t *, size_t _ISC_MEM_FLARG);
-void		isc__mem_free(isc_mem_t *, void * _ISC_MEM_FLARG);
-char *		isc__mem_strdup(isc_mem_t *, const char *_ISC_MEM_FLARG);
-void *		isc__mempool_get(isc_mempool_t * _ISC_MEM_FLARG);
-void 		isc__mempool_put(isc_mempool_t *, void * _ISC_MEM_FLARG);
+void 		
+isc__mem_put(isc_mem_t *, void *, size_t _ISC_MEM_FLARG);
+void *		
+isc__mem_allocate(isc_mem_t *, size_t _ISC_MEM_FLARG);
+void		
+isc__mem_free(isc_mem_t *, void * _ISC_MEM_FLARG);
+char *		
+isc__mem_strdup(isc_mem_t *, const char *_ISC_MEM_FLARG);
+void *		
+isc__mempool_get(isc_mempool_t * _ISC_MEM_FLARG);
+void 		
+isc__mempool_put(isc_mempool_t *, void * _ISC_MEM_FLARG);
 
 ISC_LANG_ENDDECLS
 
diff --git a/lib/isc/include/isc/taskpool.h b/lib/isc/include/isc/taskpool.h
index e598af630c..3e36516f15 100644
--- a/lib/isc/include/isc/taskpool.h
+++ b/lib/isc/include/isc/taskpool.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: taskpool.h,v 1.7 2001/01/09 21:57:40 bwelling Exp $ */
+/* $Id: taskpool.h,v 1.8 2001/03/05 18:18:52 mayer Exp $ */
 
 #ifndef ISC_TASKPOOL_H
 #define ISC_TASKPOOL_H 1
@@ -85,7 +85,8 @@ isc_taskpool_create(isc_taskmgr_t *tmgr, isc_mem_t *mctx,
  *	ISC_R_UNEXPECTED
  */
 
-void isc_taskpool_gettask(isc_taskpool_t *pool, unsigned int hash,
+void 
+isc_taskpool_gettask(isc_taskpool_t *pool, unsigned int hash,
 			  isc_task_t **targetp);
 /*
  * Attach to the task corresponding to the hash value "hash".