diff --git a/include/QF/alloc.h b/include/QF/alloc.h
index f67fe7176..a22ad78eb 100644
--- a/include/QF/alloc.h
+++ b/include/QF/alloc.h
@@ -34,6 +34,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "QF/darray.h"
+
 /** \defgroup alloc High-tide allocator.
 	\ingroup utils
 */
@@ -43,7 +45,8 @@
 /**	High-tide structure allocator for use in linked lists.
 
 	Using a free-list with the name of \c NAME_freelist, return a single
-	element.
+	element. Also, the allocated blocks are recorded in a DARRAY with the name
+	of \c NAME_blocks.
 	The type of the element must be a structure with a field named \c next.
 	When the free-list is empty, memory is claimed from the system in blocks.
 	Elements may be returned to the pool by linking them into the free-list.
@@ -65,12 +68,25 @@
 			for (i = 0; i < (s) - 1; i++)					\
 				n##_freelist[i].next = &n##_freelist[i + 1];\
 			n##_freelist[i].next = 0;						\
+			DARRAY_APPEND (&n##_blocks, n##_freelist);		\
 		}													\
 		v = n##_freelist;									\
 		n##_freelist = n##_freelist->next;					\
 		memset (v, 0, sizeof (*v));							\
 	} while (0)
 
+#define ALLOC_STATE(t,n) \
+static t *n##_freelist; \
+static struct DARRAY_TYPE(t *) n##_blocks = DARRAY_STATIC_INIT(8)
+
+#define ALLOC_FREE_BLOCKS(n) \
+	do { \
+		for (size_t i = 0; i < n##_blocks.size; i++) { \
+			free (n##_blocks.a[i]); \
+		} \
+		DARRAY_CLEAR (&n##_blocks); \
+	} while (0)
+
 /** Free a block allocated by #ALLOC
 
 	\param n		The \c NAME portion of the \c NAME_freelist free-list.
diff --git a/include/QF/set.h b/include/QF/set.h
index e7d75e4f5..dafba428c 100644
--- a/include/QF/set.h
+++ b/include/QF/set.h
@@ -32,6 +32,7 @@
 #define __QF_set_h
 
 #include "QF/qtypes.h"
+#include "QF/darray.h"
 
 /**	\defgroup set Set handling
 	\ingroup utils
@@ -116,6 +117,8 @@ typedef struct set_iter_s {
 typedef struct set_pool_s {
 	set_t      *set_freelist;
 	set_iter_t *set_iter_freelist;
+	struct DARRAY_TYPE (set_t *) set_blocks;
+	struct DARRAY_TYPE (set_iter_t *) set_iter_blocks;
 } set_pool_t;
 
 void set_pool_init (set_pool_t *set_pool);
diff --git a/libs/image/convert.c b/libs/image/convert.c
index cc49d6759..df5829f92 100644
--- a/libs/image/convert.c
+++ b/libs/image/convert.c
@@ -47,8 +47,8 @@ typedef struct colcache_color_s {
 	byte        col;
 } colcache_color_t;
 
-static colcache_t *colcache_freelist;
-static colcache_color_t *colcache_color_freelist;
+ALLOC_STATE (colcache_t, colcache);
+ALLOC_STATE (colcache_color_t, colcache_color);
 
 static colcache_color_t *
 colcache_new_color (const byte *rgb, byte ind)
diff --git a/libs/ui/txtbuffer.c b/libs/ui/txtbuffer.c
index 36c82afd6..b4d7e11d2 100644
--- a/libs/ui/txtbuffer.c
+++ b/libs/ui/txtbuffer.c
@@ -43,7 +43,7 @@
 
 #include "compat.h"
 
-static txtbuffer_t *txtbuffers_freelist;
+ALLOC_STATE (txtbuffer_t, txtbuffers);
 
 static char *
 txtbuffer_open_gap (txtbuffer_t *buffer, size_t offset, size_t length)
diff --git a/libs/util/quakefs.c b/libs/util/quakefs.c
index 333af44e7..530fcb03b 100644
--- a/libs/util/quakefs.c
+++ b/libs/util/quakefs.c
@@ -186,8 +186,8 @@ typedef struct int_findfile_s {
 	int         fname_index;
 } int_findfile_t;
 
-static searchpath_t *searchpaths_freelist;
-static vpath_t *vpaths_freelist;
+ALLOC_STATE (searchpath_t, searchpaths);
+ALLOC_STATE (vpath_t, vpaths);
 static vpath_t *qfs_vpaths;
 
 //QFS
diff --git a/libs/util/segtext.c b/libs/util/segtext.c
index ffee78d77..d215cda30 100644
--- a/libs/util/segtext.c
+++ b/libs/util/segtext.c
@@ -38,8 +38,8 @@
 #include "QF/qtypes.h"
 #include "QF/segtext.h"
 
-static segchunk_t *chunks_freelist;
-static segtext_t *texts_freelist;
+ALLOC_STATE (segchunk_t, chunks);
+ALLOC_STATE (segtext_t, texts);
 
 static segchunk_t *
 new_chunk (void)
diff --git a/libs/util/set.c b/libs/util/set.c
index 9b59172a1..0fe8fe2ec 100644
--- a/libs/util/set.c
+++ b/libs/util/set.c
@@ -45,7 +45,11 @@
 #include "QF/mathlib.h"
 #include "QF/set.h"
 
-static set_pool_t static_set_pool = {0, 0};
+static set_pool_t static_set_pool = {
+	0, 0,
+	DARRAY_STATIC_INIT (8),
+	DARRAY_STATIC_INIT (8),
+};
 
 static set_iter_t *
 new_setiter (set_pool_t *set_pool)
diff --git a/libs/util/sys.c b/libs/util/sys.c
index d4d6f23d3..64c8100b4 100644
--- a/libs/util/sys.c
+++ b/libs/util/sys.c
@@ -564,9 +564,15 @@ VISIBLE void
 Sys_PushErrorHandler (sys_error_t func, void *data)
 {
 	error_handler_t *eh;
-	ALLOC (16, error_handler_t, error_handler, eh);
+	if (error_handler_freelist) {
+		eh = error_handler_freelist;
+	} else {
+		eh = malloc (sizeof (error_handler_t));
+		eh->next = 0;
+	}
 	eh->func = func;
 	eh->data = data;
+	error_handler_freelist = eh->next;
 	eh->next = error_handler;
 	error_handler = eh;
 }
@@ -581,7 +587,8 @@ Sys_PopErrorHandler (void)
 	}
 	eh = error_handler;
 	error_handler = eh->next;
-	FREE (error_handler, eh);
+	eh->next = error_handler_freelist;
+	error_handler_freelist = eh;
 }
 
 
diff --git a/libs/video/renderer/glsl/glsl_shader.c b/libs/video/renderer/glsl/glsl_shader.c
index d7eace17a..535d63413 100644
--- a/libs/video/renderer/glsl/glsl_shader.c
+++ b/libs/video/renderer/glsl/glsl_shader.c
@@ -48,7 +48,7 @@ typedef struct glsl_effect_s {
 } glsl_effect_t;
 
 static hashtab_t *effect_tab;
-static glsl_effect_t *effects_freelist;
+ALLOC_STATE (glsl_effect_t, effects);
 
 static glsl_effect_t *
 new_effect (void)
diff --git a/tools/qfcc/source/attribute.c b/tools/qfcc/source/attribute.c
index b821124c1..a1cbe443d 100644
--- a/tools/qfcc/source/attribute.c
+++ b/tools/qfcc/source/attribute.c
@@ -38,7 +38,7 @@
 #include "tools/qfcc/include/expr.h"
 #include "tools/qfcc/include/strpool.h"
 
-static attribute_t *attributes_freelist;
+ALLOC_STATE (attribute_t, attributes);
 
 attribute_t *new_attribute(const char *name, expr_t *value)
 {
diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c
index 1c3ad201f..9681587bc 100644
--- a/tools/qfcc/source/dags.c
+++ b/tools/qfcc/source/dags.c
@@ -60,9 +60,9 @@
 #include "tools/qfcc/include/type.h"
 #include "tools/qfcc/include/value.h"
 
-static daglabel_t *labels_freelist;
-static dagnode_t *nodes_freelist;
-static dag_t *dags_freelist;
+ALLOC_STATE (daglabel_t, labels);
+ALLOC_STATE (dagnode_t, nodes);
+ALLOC_STATE (dag_t, dags);
 
 static daglabel_t *daglabel_chain;
 
diff --git a/tools/qfcc/source/debug.c b/tools/qfcc/source/debug.c
index 4afff69ee..f38952315 100644
--- a/tools/qfcc/source/debug.c
+++ b/tools/qfcc/source/debug.c
@@ -58,7 +58,7 @@
 
 int         lineno_base;
 
-static srcline_t *srclines_freelist;
+ALLOC_STATE (srcline_t, srclines);
 
 static void
 push_source_file (void)
diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index b745f2da3..55f470c8d 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -62,7 +62,7 @@
 #include "tools/qfcc/include/type.h"
 #include "tools/qfcc/include/value.h"
 
-static def_t *defs_freelist;
+ALLOC_STATE (def_t, defs);
 
 static void
 set_storage_bits (def_t *def, storage_class_t storage)
diff --git a/tools/qfcc/source/defspace.c b/tools/qfcc/source/defspace.c
index 7858db746..97333dae6 100644
--- a/tools/qfcc/source/defspace.c
+++ b/tools/qfcc/source/defspace.c
@@ -54,8 +54,8 @@ typedef struct locref_s {
 	int         size;
 } locref_t;
 
-static defspace_t *spaces_freelist;
-static locref_t *locrefs_freelist;
+ALLOC_STATE (defspace_t, spaces);
+ALLOC_STATE (locref_t, locrefs);
 
 static locref_t *
 new_locref (int ofs, int size, locref_t *next)
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index 1fc1249d3..dbbee0ff8 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -65,7 +65,7 @@
 
 #include "tools/qfcc/source/qc-parse.h"
 
-static expr_t *exprs_freelist;
+ALLOC_STATE (expr_t, exprs);
 
 void
 convert_name (expr_t *e)
diff --git a/tools/qfcc/source/expr_compound.c b/tools/qfcc/source/expr_compound.c
index e8b81747d..2ba6f489a 100644
--- a/tools/qfcc/source/expr_compound.c
+++ b/tools/qfcc/source/expr_compound.c
@@ -51,7 +51,7 @@
 #include "tools/qfcc/include/symtab.h"
 #include "tools/qfcc/include/type.h"
 
-static element_t *elements_freelist;
+ALLOC_STATE (element_t, elements);
 
 element_t *
 new_element (expr_t *expr, symbol_t *symbol)
diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c
index 43768096a..a8c94c952 100644
--- a/tools/qfcc/source/flow.c
+++ b/tools/qfcc/source/flow.c
@@ -80,10 +80,10 @@ static const int num_flow_params = sizeof(flow_params)/sizeof(flow_params[0]);
 
 /**	\name Flow analysis memory management */
 ///@{
-static flowvar_t *vars_freelist;		///< flowvar pool
-static flowloop_t *loops_freelist;		///< flow loop pool
-static flownode_t *nodes_freelist;		///< flow node pool
-static flowgraph_t *graphs_freelist;	///< flow graph pool
+ALLOC_STATE (flowvar_t, vars);			///< flowvar pool
+ALLOC_STATE (flowloop_t, loops);		///< flow loop pool
+ALLOC_STATE (flownode_t, nodes);		///< flow node pool
+ALLOC_STATE (flowgraph_t, graphs);		///< flow graph pool
 
 /**	Allocate a new flow var.
  *
diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c
index 296ecf9fe..45b1311eb 100644
--- a/tools/qfcc/source/function.c
+++ b/tools/qfcc/source/function.c
@@ -66,8 +66,8 @@
 #include "tools/qfcc/include/type.h"
 #include "tools/qfcc/include/value.h"
 
-static param_t *params_freelist;
-static function_t *functions_freelist;
+ALLOC_STATE (param_t, params);
+ALLOC_STATE (function_t, functions);
 static hashtab_t *overloaded_functions;
 static hashtab_t *function_map;
 
diff --git a/tools/qfcc/source/grab.c b/tools/qfcc/source/grab.c
index 0d59c1217..7cad9cc62 100644
--- a/tools/qfcc/source/grab.c
+++ b/tools/qfcc/source/grab.c
@@ -64,7 +64,7 @@ typedef struct frame_s {
 	int			num;
 } frame_t;
 
-static frame_t *frames_freelist;
+ALLOC_STATE (frame_t, frames);
 static frame_t *frame_list;
 static frame_t **frame_tail = &frame_list;
 
diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c
index e058f190d..8d04f4ef5 100644
--- a/tools/qfcc/source/linker.c
+++ b/tools/qfcc/source/linker.c
@@ -131,7 +131,7 @@ static builtin_sym_t builtin_symbols[] __attribute__ ((used)) = {
 static const unsigned num_builtins = sizeof (builtin_symbols)
 									 / sizeof (builtin_symbols[0]);
 
-static defref_t *defrefs_freelist;
+ALLOC_STATE (defref_t, defrefs);
 
 static hashtab_t *extern_data_defs;
 static hashtab_t *defined_data_defs;
diff --git a/tools/qfcc/source/pragma.c b/tools/qfcc/source/pragma.c
index 2ee208ca5..af6897c00 100644
--- a/tools/qfcc/source/pragma.c
+++ b/tools/qfcc/source/pragma.c
@@ -57,7 +57,7 @@ typedef struct pragma_arg_s {
 	const char *arg;
 } pragma_arg_t;
 
-static pragma_arg_t *pragma_args_freelist;
+ALLOC_STATE (pragma_arg_t, pragma_args);
 static pragma_arg_t *pragma_args;
 static pragma_arg_t **pragma_args_tail = &pragma_args;
 
diff --git a/tools/qfcc/source/reloc.c b/tools/qfcc/source/reloc.c
index 252b8e404..eec081153 100644
--- a/tools/qfcc/source/reloc.c
+++ b/tools/qfcc/source/reloc.c
@@ -51,7 +51,7 @@
 #include "tools/qfcc/include/qfcc.h"
 #include "tools/qfcc/include/reloc.h"
 
-static reloc_t *refs_freelist;
+ALLOC_STATE (reloc_t, refs);
 
 const char * const reloc_name[] = {
 	"rel_none",
diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c
index a3b0a64fb..833545c57 100644
--- a/tools/qfcc/source/statements.c
+++ b/tools/qfcc/source/statements.c
@@ -218,10 +218,10 @@ print_statement (statement_t *s)
 	print_operand_chain ("kill", s->kill);
 }
 
-static pseudoop_t *pseudoops_freelist;
-static sblock_t *sblocks_freelist;
-static statement_t *statements_freelist;
-static operand_t *operands_freelist;
+ALLOC_STATE (pseudoop_t, pseudoops);
+ALLOC_STATE (sblock_t, sblocks);
+ALLOC_STATE (statement_t, statements);
+ALLOC_STATE (operand_t, operands);
 
 sblock_t *
 new_sblock (void)
diff --git a/tools/qfcc/source/symtab.c b/tools/qfcc/source/symtab.c
index 6470d2682..4ad506955 100644
--- a/tools/qfcc/source/symtab.c
+++ b/tools/qfcc/source/symtab.c
@@ -49,8 +49,8 @@
 #include "tools/qfcc/include/symtab.h"
 #include "tools/qfcc/include/type.h"
 
-static symtab_t *symtabs_freelist;
-static symbol_t *symbols_freelist;
+ALLOC_STATE (symtab_t, symtabs);
+ALLOC_STATE (symbol_t, symbols);
 
 static const char * const sy_type_names[] = {
 	"sy_name",
diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c
index 99916d604..2894c71d3 100644
--- a/tools/qfcc/source/type.c
+++ b/tools/qfcc/source/type.c
@@ -161,7 +161,7 @@ int type_cast_map[ev_type_count] = {
 	//[ev_bool64] = 7,
 };
 
-static type_t *types_freelist;
+ALLOC_STATE (type_t, types);
 
 etype_t
 low_level_type (type_t *type)
diff --git a/tools/qfcc/source/value.c b/tools/qfcc/source/value.c
index b4633df74..14e891827 100644
--- a/tools/qfcc/source/value.c
+++ b/tools/qfcc/source/value.c
@@ -80,7 +80,7 @@ typedef struct {
 } immediate_t;
 
 static hashtab_t *value_table;
-static ex_value_t *values_freelist;
+ALLOC_STATE (ex_value_t, values);
 
 //FIXME this (to setup_value_progs) should be in its own file and more
 //general (good for constant folding, too, and maybe some others).