diff --git a/src/arch/arm64/armv8/exception.c b/src/arch/arm64/armv8/exception.c
index f3a075522e..80b619df94 100644
--- a/src/arch/arm64/armv8/exception.c
+++ b/src/arch/arm64/armv8/exception.c
@@ -65,25 +65,25 @@ static void print_regs(struct exc_state *exc_state)
 
 static struct exception_handler *handlers[NUM_EXC_VIDS];
 
-int exception_handler_register(uint64_t vid, struct exception_handler *h)
+enum cb_err exception_handler_register(uint64_t vid, struct exception_handler *h)
 {
 	if (vid >= NUM_EXC_VIDS)
-		return -1;
+		return CB_ERR;
 
 	/* Just place at head of queue. */
 	h->next = handlers[vid];
 	store_release(&handlers[vid], h);
 
-	return 0;
+	return CB_SUCCESS;
 }
 
-int exception_handler_unregister(uint64_t vid, struct exception_handler *h)
+enum cb_err exception_handler_unregister(uint64_t vid, struct exception_handler *h)
 {
 	struct exception_handler *cur;
 	struct exception_handler **prev;
 
 	if (vid >= NUM_EXC_VIDS)
-		return -1;
+		return CB_ERR;
 
 	prev = &handlers[vid];
 
@@ -92,11 +92,11 @@ int exception_handler_unregister(uint64_t vid, struct exception_handler *h)
 			continue;
 		/* Update previous pointer. */
 		store_release(prev, cur->next);
-		return 0;
+		return CB_SUCCESS;
 	}
 
 	/* Not found */
-	return -1;
+	return CB_ERR;
 }
 
 static void print_exception_info(struct exc_state *state, uint64_t idx)
diff --git a/src/arch/arm64/include/armv8/arch/exception.h b/src/arch/arm64/include/armv8/arch/exception.h
index 72ed772500..2c5b7f9145 100644
--- a/src/arch/arm64/include/armv8/arch/exception.h
+++ b/src/arch/arm64/include/armv8/arch/exception.h
@@ -4,6 +4,7 @@
 #define _ARCH_EXCEPTION_H
 
 #include <arch/transition.h>
+#include <types.h>
 
 /* Initialize the exception handling on the current CPU. */
 void exception_init(void);
@@ -31,12 +32,12 @@ struct exception_handler {
  * Register a handler provided with the associated vector id. Returns 0 on
  * success, < 0 on error. Note that registration is not thread/interrupt safe.
  */
-int exception_handler_register(uint64_t vid, struct exception_handler *h);
+enum cb_err exception_handler_register(uint64_t vid, struct exception_handler *h);
 
 /*
  * Unregister a handler from the vector id. Return 0 on success, < 0 on error.
  * Note that the unregistration is not thread/interrupt safe.
  */
-int exception_handler_unregister(uint64_t vid, struct exception_handler *h);
+enum cb_err exception_handler_unregister(uint64_t vid, struct exception_handler *h);
 
 #endif