diff --git a/libratbox/src/balloc.c b/libratbox/src/balloc.c
index c827614a..a147feb1 100644
--- a/libratbox/src/balloc.c
+++ b/libratbox/src/balloc.c
@@ -492,11 +492,14 @@ rb_bh_usage(rb_bh *bh, size_t *bused, size_t *bfree, size_t *bmemusage, const ch
 	if(desc != NULL)
 		*desc = bh->desc;
 #else
-	static char *noballoc = "no blockheap";
-	*bused = 0;
-	*bfree = 0;
-	*bmemusage = 0;
-	*desc = noballoc;
+	if(bused != NULL)
+		*bused = 0;
+	if(bfree != NULL)
+		*bfree = 0;
+	if(bmemusage != NULL)
+		*bmemusage = 0;
+	if(desc != NULL)
+		*desc = "no blockheap";
 #endif
 }
 
diff --git a/libratbox/src/linebuf.c b/libratbox/src/linebuf.c
index 5e7fbb4e..b3d2bb9d 100644
--- a/libratbox/src/linebuf.c
+++ b/libratbox/src/linebuf.c
@@ -28,9 +28,7 @@
 #include <ratbox_lib.h>
 #include <commio-int.h>
 
-#ifndef NOBALLOC
 static rb_bh *rb_linebuf_heap;
-#endif
 
 static int bufline_count = 0;