diff --git a/include/runtime_services/spm_common.h b/include/runtime_services/spm_common.h
index 4dd5e5c..b055c92 100644
--- a/include/runtime_services/spm_common.h
+++ b/include/runtime_services/spm_common.h
@@ -103,10 +103,10 @@
 
 bool check_spmc_execution_level(void);
 
-unsigned int get_ffa_feature_test_target(
-		const struct ffa_features_test **test_target);
+size_t get_ffa_feature_test_target(
+	const struct ffa_features_test **test_target);
 bool ffa_features_test_targets(const struct ffa_features_test *targets,
-			       uint32_t test_target_size);
+			       size_t test_target_size);
 
 /**
  * Helper to conduct a memory retrieve. This is to be called by the receiver