diff --git a/include/common/ep_info.h b/include/common/ep_info.h
index a09d03b..97df52b 100644
--- a/include/common/ep_info.h
+++ b/include/common/ep_info.h
@@ -69,21 +69,21 @@
 #include <lib/cassert.h>
 
 typedef struct aapcs64_params {
-	u_register_t arg0;
-	u_register_t arg1;
-	u_register_t arg2;
-	u_register_t arg3;
-	u_register_t arg4;
-	u_register_t arg5;
-	u_register_t arg6;
-	u_register_t arg7;
+	uint64_t arg0;
+	uint64_t arg1;
+	uint64_t arg2;
+	uint64_t arg3;
+	uint64_t arg4;
+	uint64_t arg5;
+	uint64_t arg6;
+	uint64_t arg7;
 } aapcs64_params_t;
 
 typedef struct aapcs32_params {
-	u_register_t arg0;
-	u_register_t arg1;
-	u_register_t arg2;
-	u_register_t arg3;
+	uint32_t arg0;
+	uint32_t arg1;
+	uint32_t arg2;
+	uint32_t arg3;
 } aapcs32_params_t;
 
 /*****************************************************************************