diff --git a/src/backend.cmod b/src/backend.cmod
index c291bbbdb3fd8c9da47ec2ed7092a1076f9c84cd..2db5e074c0bd3d2b346bd3dabdcf86a955cbf263 100644
--- a/src/backend.cmod
+++ b/src/backend.cmod
@@ -5,7 +5,7 @@
 */
 
 /*
- * $Id: backend.cmod,v 1.172 2005/02/26 21:59:56 nilsson Exp $
+ * $Id: backend.cmod,v 1.173 2005/04/08 16:53:08 grubba Exp $
  *
  * Backend object.
  */
@@ -86,7 +86,7 @@
 /* Declarations for the legacy backend interface stuff. */
 
 #include "block_alloc_h.h"
-BLOCK_ALLOC (compat_cb_box, N/A)
+BLOCK_ALLOC (compat_cb_box, N/A);
 static int compat_box_dispatcher (struct fd_callback_box *box, int event);
 static void update_fd_set (struct Backend_struct *me, int fd,
 			   int old_events, int new_events);
diff --git a/src/callback.h b/src/callback.h
index e31b57927cfb9008ef8b94aa26e64ec9d7917b8c..ff08c3238b81168fe185c531f3d3a3e8e65fd553 100644
--- a/src/callback.h
+++ b/src/callback.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: callback.h,v 1.18 2002/10/11 01:39:30 nilsson Exp $
+|| $Id: callback.h,v 1.19 2005/04/08 16:54:19 grubba Exp $
 */
 
 #ifndef CALLBACK_H
@@ -25,7 +25,7 @@ typedef void (*callback_func)(struct callback *, void *,void *);
 #include "block_alloc_h.h"
 /* Prototypes begin here */
 struct callback;
-BLOCK_ALLOC(callback, CALLBACK_CHUNK)
+BLOCK_ALLOC(callback, CALLBACK_CHUNK);
 PMOD_EXPORT void low_call_callback(struct callback_list *lst, void *arg);
 PMOD_EXPORT struct callback *debug_add_to_callback(struct callback_list *lst,
 						   callback_func call,
diff --git a/src/constants.h b/src/constants.h
index bd8dd4c38bb471f503097d97932131cd8726a3b5..ead98dfee9b3152fbae744dcadb458da25d6d71d 100644
--- a/src/constants.h
+++ b/src/constants.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: constants.h,v 1.33 2004/12/30 12:57:24 grubba Exp $
+|| $Id: constants.h,v 1.34 2005/04/08 16:54:41 grubba Exp $
 */
 
 #ifndef ADD_EFUN_H
@@ -50,7 +50,7 @@ void low_add_efun(struct pike_string *name, struct svalue *fun);
 void low_add_constant(const char *name, struct svalue *fun);
 void add_pike_string_constant(const char *name, const char *str, int len);
 PMOD_EXPORT void add_global_program(const char *name, struct program *p);
-BLOCK_ALLOC_FILL_PAGES(callable,2)
+BLOCK_ALLOC_FILL_PAGES(callable,2);
 PMOD_EXPORT struct callable *low_make_callable(c_fun fun,
 				   struct pike_string *name,
 				   struct pike_type *type,
diff --git a/src/gc.h b/src/gc.h
index ba81639e15a4c0b60cf8b10f45309f6de9603c83..99858caaf7500ccb7917e318dd7a260d262963f3 100644
--- a/src/gc.h
+++ b/src/gc.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: gc.h,v 1.117 2004/09/28 23:51:01 mast Exp $
+|| $Id: gc.h,v 1.118 2005/04/08 16:54:55 grubba Exp $
 */
 
 #ifndef GC_H
@@ -248,7 +248,7 @@ struct marker
 #endif
 
 #include "block_alloc_h.h"
-PTR_HASH_ALLOC_FIXED_FILL_PAGES(marker, n/a)
+PTR_HASH_ALLOC_FIXED_FILL_PAGES(marker, n/a);
 
 #ifdef PIKE_DEBUG
 #undef get_marker
diff --git a/src/interpret.h b/src/interpret.h
index 74b2e8fab8b97ded6c57bcc7faf92fdc6cc9c6ec..a652a8bee43fb443008906bb44fc175f35a01e40 100644
--- a/src/interpret.h
+++ b/src/interpret.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: interpret.h,v 1.158 2005/01/25 18:23:52 grubba Exp $
+|| $Id: interpret.h,v 1.159 2005/04/08 16:55:53 grubba Exp $
 */
 
 #ifndef INTERPRET_H
@@ -667,7 +667,7 @@ void print_return_value(void);
 void reset_evaluator(void);
 struct backlog;
 void dump_backlog(void);
-BLOCK_ALLOC(pike_frame,128)
+BLOCK_ALLOC(pike_frame,128);
 
 #ifdef PIKE_USE_MACHINE_CODE
 #if defined(OPCODE_INLINE_BRANCH) || defined(INS_F_JUMP) || \
diff --git a/src/mapping.h b/src/mapping.h
index 53a31273d64148faa450c307d7589084148009f3..fa0ef823a1eb477a9b40a7c2238d99766e5ae3c1 100644
--- a/src/mapping.h
+++ b/src/mapping.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: mapping.h,v 1.59 2004/09/28 23:58:26 mast Exp $
+|| $Id: mapping.h,v 1.60 2005/04/08 16:55:53 grubba Exp $
 */
 
 #ifndef MAPPING_H
@@ -108,7 +108,7 @@ extern struct mapping *gc_internal_mapping;
 PMOD_PROTO void really_free_mapping(struct mapping *md);
 
 /* Prototypes begin here */
-BLOCK_ALLOC_FILL_PAGES(mapping, 2)
+BLOCK_ALLOC_FILL_PAGES(mapping, 2);
 
 
 
diff --git a/src/multiset.h b/src/multiset.h
index 53eca44fd01d3d672b7c68d50e5d588ed265d6f7..ef5505f6987b766095216b7978dee1a7d97fdbf0 100644
--- a/src/multiset.h
+++ b/src/multiset.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: multiset.h,v 1.39 2004/09/30 14:00:15 mast Exp $
+|| $Id: multiset.h,v 1.40 2005/04/08 16:55:53 grubba Exp $
 */
 
 #ifndef MULTISET_H
@@ -250,7 +250,7 @@ union msnode *debug_check_msnode (
 
 #endif
 
-BLOCK_ALLOC_FILL_PAGES (multiset, 2)
+BLOCK_ALLOC_FILL_PAGES (multiset, 2);
 
 /* See rbtree.h for a description of the operations.
  *
diff --git a/src/object.h b/src/object.h
index 88ea536b00bceb447973086cc7a2577d14dd753e..6355c0add565d7ef6d9358d4a5a16ffbd87c25f8 100644
--- a/src/object.h
+++ b/src/object.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: object.h,v 1.90 2005/02/09 16:35:50 mast Exp $
+|| $Id: object.h,v 1.91 2005/04/08 16:55:53 grubba Exp $
 */
 
 #ifndef OBJECT_H
@@ -75,7 +75,7 @@ enum object_destruct_reason {
 
 #include "block_alloc_h.h"
 /* Prototypes begin here */
-BLOCK_ALLOC_FILL_PAGES(object, 2)
+BLOCK_ALLOC_FILL_PAGES(object, 2);
 PMOD_EXPORT struct object *low_clone(struct program *p);
 PMOD_EXPORT void call_c_initializers(struct object *o);
 void call_prog_event(struct object *o, int event);
@@ -92,7 +92,7 @@ struct object *decode_value_clone_object(struct svalue *prog);
 PMOD_EXPORT struct object *get_master(void);
 PMOD_EXPORT struct object *debug_master(void);
 struct destroy_called_mark;
-PTR_HASH_ALLOC(destroy_called_mark,128)
+PTR_HASH_ALLOC(destroy_called_mark,128);
 PMOD_EXPORT struct program *get_program_for_object_being_destructed(struct object * o);
 PMOD_EXPORT void destruct_object (struct object *o, enum object_destruct_reason reason);
 #define destruct(o) destruct_object (o, DESTRUCT_EXPLICIT)
diff --git a/src/pike_memory.c b/src/pike_memory.c
index 5507dcd1b280eec697679c1dbd3ee5e24392e785..3e4604e4e3e7dac88f4265e0ff91a8d4a10ca06f 100644
--- a/src/pike_memory.c
+++ b/src/pike_memory.c
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: pike_memory.c,v 1.159 2005/02/26 22:01:52 nilsson Exp $
+|| $Id: pike_memory.c,v 1.160 2005/04/08 17:00:09 grubba Exp $
 */
 
 #include "global.h"
@@ -693,9 +693,9 @@ static struct memhdr *my_find_memhdr(void *, int);
 
 #include "block_alloc_h.h"
 
-BLOCK_ALLOC_FILL_PAGES(memloc, n/a)
-BLOCK_ALLOC_FILL_PAGES(memory_map, n/a)
-BLOCK_ALLOC_FILL_PAGES(memory_map_entry, n/a)
+BLOCK_ALLOC_FILL_PAGES(memloc, n/a);
+BLOCK_ALLOC_FILL_PAGES(memory_map, n/a);
+BLOCK_ALLOC_FILL_PAGES(memory_map_entry, n/a);
 
 #include "block_alloc.h"
 
diff --git a/src/pike_types.h b/src/pike_types.h
index 7284f53739f8f2619518049adb6e5a4189c99f2d..75f3d73774fa8729d33cb1c73a37671d5427204f 100644
--- a/src/pike_types.h
+++ b/src/pike_types.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: pike_types.h,v 1.93 2004/01/22 23:17:27 nilsson Exp $
+|| $Id: pike_types.h,v 1.94 2005/04/08 16:57:11 grubba Exp $
 */
 
 #ifndef PIKE_TYPES_H
@@ -39,7 +39,7 @@ extern size_t pike_type_hash_size;
 #define CDR_TO_INT(TYPE) ((char *) (TYPE)->cdr - (char *) 0)
 
 #include "block_alloc_h.h"
-BLOCK_ALLOC(pike_type, n/a)
+BLOCK_ALLOC(pike_type, n/a);
 
 /* pike_type flags: */
 #define PT_FLAG_MARKER	1	/* Type contains markers. */
diff --git a/src/stralloc.h b/src/stralloc.h
index 7a1b741e9a6d066aeca6f77aedf14a15341ed7f9..8ba9aa434f3126b6ee10b103993519606e870b51 100644
--- a/src/stralloc.h
+++ b/src/stralloc.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: stralloc.h,v 1.91 2005/01/11 19:35:12 nilsson Exp $
+|| $Id: stralloc.h,v 1.92 2005/04/08 16:57:35 grubba Exp $
 */
 
 #ifndef STRALLOC_H
@@ -208,9 +208,9 @@ PMOD_EXPORT struct pike_string *findstring(const char *foo);
 struct short_pike_string0;
 struct short_pike_string1;
 struct short_pike_string2;
-BLOCK_ALLOC(short_pike_string0, SHORT_STRING_BLOCK)
-BLOCK_ALLOC(short_pike_string1, SHORT_STRING_BLOCK)
-BLOCK_ALLOC(short_pike_string2, SHORT_STRING_BLOCK)
+BLOCK_ALLOC(short_pike_string0, SHORT_STRING_BLOCK);
+BLOCK_ALLOC(short_pike_string1, SHORT_STRING_BLOCK);
+BLOCK_ALLOC(short_pike_string2, SHORT_STRING_BLOCK);