diff --git a/src/block_alloc.h b/src/block_alloc.h
index 1f1e4b549577b97ded9ffde3c21b341f6622a044..144ea87f190b6d9cac1ac9add1fd052ded8d37e9 100644
--- a/src/block_alloc.h
+++ b/src/block_alloc.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: block_alloc.h,v 1.83 2007/04/02 17:03:47 grubba Exp $
+|| $Id: block_alloc.h,v 1.84 2008/01/24 18:34:19 grubba Exp $
 */
 
 #undef PRE_INIT_BLOCK
@@ -581,13 +581,12 @@ struct DATA *PIKE_CONCAT(get_,DATA)(void *ptr)			 	     \
   return p;                                                                  \
 }									     \
 									     \
-int PIKE_CONCAT3(check_,DATA,_semafore)(void *ptr)			     \
+int PIKE_CONCAT3(check_,DATA,_semaphore)(void *ptr)			     \
 {									     \
-  struct DATA *p;							     \
   PIKE_HASH_T hval = (PIKE_HASH_T)PTR_TO_INT(ptr);			     \
   DO_IF_RUN_UNLOCKED(mt_lock(&PIKE_CONCAT(DATA,_mutex)));                    \
   hval %= (PIKE_HASH_T)PIKE_CONCAT(DATA,_hash_table_size);		     \
-  if((p=PIKE_CONCAT3(really_low_find_,DATA,_unlocked)(ptr, hval)))	     \
+  if(PIKE_CONCAT3(really_low_find_,DATA,_unlocked)(ptr, hval))		     \
   {                                                                          \
     DO_IF_RUN_UNLOCKED(mt_unlock(&PIKE_CONCAT(DATA,_mutex)));                \
     return 0;								     \
diff --git a/src/block_alloc_h.h b/src/block_alloc_h.h
index 379c7ac8550ab02c431f2ada6ed180a8a6a83873..cf3579116a5037723203bc1f09d88ee661a4510b 100644
--- a/src/block_alloc_h.h
+++ b/src/block_alloc_h.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: block_alloc_h.h,v 1.23 2005/04/08 16:52:29 grubba Exp $
+|| $Id: block_alloc_h.h,v 1.24 2008/01/24 18:34:19 grubba Exp $
 */
 
 #undef BLOCK_ALLOC
@@ -39,7 +39,7 @@ struct DATA *PIKE_CONCAT3(make_,DATA,_unlocked)			\
 		(void *ptr, PIKE_HASH_T hval);			\
 struct DATA *PIKE_CONCAT(make_,DATA)(void *ptr);		\
 struct DATA *PIKE_CONCAT(get_,DATA)(void *ptr);			\
-int PIKE_CONCAT3(check_,DATA,_semafore)(void *ptr);		\
+int PIKE_CONCAT3(check_,DATA,_semaphore)(void *ptr);		\
 void PIKE_CONCAT(move_,DATA)(struct DATA *block, void *new_ptr); \
 int PIKE_CONCAT(remove_,DATA)(void *ptr);			\
 void PIKE_CONCAT3(low_init_,DATA,_hash)(size_t);		\
diff --git a/src/object.c b/src/object.c
index 43c951098ffe1afd7c2dd99382e2020edfb94a5e..88f901521a69e1e3cb39effb53d1f4594aaaf8c9 100644
--- a/src/object.c
+++ b/src/object.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: object.c,v 1.279 2007/12/18 19:10:03 grubba Exp $
+|| $Id: object.c,v 1.280 2008/01/24 18:34:19 grubba Exp $
 */
 
 #include "global.h"
@@ -732,7 +732,7 @@ static void call_destroy(struct object *o, enum object_destruct_reason reason)
     if(Pike_in_gc > GC_PASS_PREPARE && Pike_in_gc < GC_PASS_FREE)
       Pike_fatal("Calling destroy() inside gc.\n");
 #endif
-    if(check_destroy_called_mark_semafore(o))
+    if(check_destroy_called_mark_semaphore(o))
     {
       JMP_BUF jmp;