diff --git a/src/builtin_functions.c b/src/builtin_functions.c
index c937bb86a125a0277e0262b057fb85b57a027efe..9b63265beb0958c5e3d750a8241a513c6627cf4b 100644
--- a/src/builtin_functions.c
+++ b/src/builtin_functions.c
@@ -5,7 +5,7 @@
 \*/
 /**/
 #include "global.h"
-RCSID("$Id: builtin_functions.c,v 1.268 2000/04/28 17:14:47 noring Exp $");
+RCSID("$Id: builtin_functions.c,v 1.269 2000/04/30 11:05:08 grubba Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "pike_macros.h"
@@ -70,11 +70,7 @@ void f_equal(INT32 args)
   push_int(i);
 }
 
-#ifdef DEBUG_MALLOC
-void _f_aggregate(INT32 args)
-#else
-void f_aggregate(INT32 args)
-#endif
+void debug_f_aggregate(INT32 args)
 {
   struct array *a;
 #ifdef PIKE_DEBUG
@@ -5794,13 +5790,8 @@ void init_builtin_efuns(void)
 	   tFunc(tStr tOr(tVoid,tMix),tVoid),OPT_SIDE_EFFECT);
 
 /* function(0=mixed ...:array(0)) */
-#ifdef DEBUG_MALLOC
-  ADD_EFUN("aggregate",_f_aggregate,
+  ADD_EFUN("aggregate",debug_f_aggregate,
 	   tFuncV(tNone,tSetvar(0,tMix),tArr(tVar(0))),OPT_TRY_OPTIMIZE);
-#else
-  ADD_EFUN("aggregate",f_aggregate,
-	   tFuncV(tNone,tSetvar(0,tMix),tArr(tVar(0))),OPT_TRY_OPTIMIZE);
-#endif
   
 /* function(0=mixed ...:multiset(0)) */
   ADD_EFUN("aggregate_multiset",f_aggregate_multiset,
diff --git a/src/builtin_functions.h b/src/builtin_functions.h
index 043a4aea2e1bd6d3664e58b79642a955405e4960..58b156ee31053a7e1b84c21a8c19f4494d01fcfd 100644
--- a/src/builtin_functions.h
+++ b/src/builtin_functions.h
@@ -5,7 +5,7 @@
 \*/
 
 /*
- * $Id: builtin_functions.h,v 1.12 2000/02/17 00:31:07 hubbe Exp $
+ * $Id: builtin_functions.h,v 1.13 2000/04/30 11:05:08 grubba Exp $
  */
 #ifndef BUILTIN_EFUNS_H
 #define BUILTIN_EFUNS_H
@@ -15,11 +15,11 @@
 #include "callback.h"
 
 /* Prototypes begin here */
+void debug_f_aggregate(INT32 args);
 #ifdef DEBUG_MALLOC
-void _f_aggregate(INT32 args);
-#define f_aggregate(X) do { _f_aggregate(X); debug_malloc_touch(Pike_sp[-1].u.refs); } while (0)
+#define f_aggregate(X) do { debug_f_aggregate(X); debug_malloc_touch(Pike_sp[-1].u.refs); } while (0)
 #else
-void f_aggregate(INT32 args);
+#define f_aggregate(X) debug_f_aggregate(X)
 #endif
 
 void f_equal(INT32 args);