diff --git a/include/common.h b/include/common.h
index f93bd7f..abbe73f 100644
--- a/include/common.h
+++ b/include/common.h
@@ -109,8 +109,8 @@
 
 #define PAGE_SIZE	4096
 #define PAGE_SHIFT	12
-#define PAGE_ALIGN(s) (((s) + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1))
-#define PAGE_ALIGN_DOWN(x) ((x) & ~(PAGE_SIZE - 1))
+#define PAGE_ALIGN(s)	ALIGN(s, PAGE_SIZE)
+#define PAGE_ALIGN_DOWN(x) ALIGN_DOWN(x, PAGE_SIZE)
 
 int memory_display(const void *addr, loff_t offs, unsigned nbytes, int size, int swab);