diff --git a/src/block_allocator.c b/src/block_allocator.c
index 25a95a4e1372be5cf9e6422e174d4ba14e0362ef..486a72c2410cf38586c73e8762da84693bc41b6b 100644
--- a/src/block_allocator.c
+++ b/src/block_allocator.c
@@ -74,7 +74,7 @@ static struct ba_page * ba_alloc_page(struct block_allocator * a, int i) {
     size_t n = l.offset + l.block_size + l.doffset;
     struct ba_page * p;
     if (l.alignment) {
-	p = aligned_alloc(n, l.alignment);
+	p = xalloc_aligned(n, l.alignment);
     } else {
 #ifdef DEBUG_MALLOC
 	/* In debug malloc mode, calling xalloc from the block alloc may result
diff --git a/src/pike_memory.c b/src/pike_memory.c
index f6ef05922ea0a59396baeed33797a36d24a25920..0b1e3cf920c919a523cde0d0fed3cce38fb4df9d 100644
--- a/src/pike_memory.c
+++ b/src/pike_memory.c
@@ -415,7 +415,7 @@ PMOD_EXPORT void *debug_xcalloc(size_t n, size_t s)
   return 0;
 }
 
-PMOD_EXPORT void *aligned_alloc(size_t size, size_t alignment) {
+PMOD_EXPORT void *xalloc_aligned(size_t size, size_t alignment) {
     void * ret;
 
     if (!size) return 0;
diff --git a/src/pike_memory.h b/src/pike_memory.h
index 80570f0f8f369a9c0d4e6dceda07c079f40beee4..961c3ac72e32c057ab5cb340b04f1c2fb72f6e84 100644
--- a/src/pike_memory.h
+++ b/src/pike_memory.h
@@ -233,7 +233,7 @@ PMOD_EXPORT void *debug_xmalloc(size_t s) MALLOC_FUNCTION;
 PMOD_EXPORT void debug_xfree(void *mem);
 PMOD_EXPORT void *debug_xrealloc(void *m, size_t s) MALLOC_FUNCTION;
 PMOD_EXPORT void *debug_xcalloc(size_t n, size_t s) MALLOC_FUNCTION;
-PMOD_EXPORT void *aligned_alloc(size_t size, size_t alignment) MALLOC_FUNCTION;
+PMOD_EXPORT void *xalloc_aligned(size_t size, size_t alignment) MALLOC_FUNCTION;
 
 #define PIKE_ALIGNTO(x, a)	(((x) + (a)-1) & ~((a)-1))