diff --git a/elfloader-tool/include/arch-arm/cpuid.h b/elfloader-tool/include/arch-arm/cpuid.h
index f84612be..c0e1a6ce 100644
--- a/elfloader-tool/include/arch-arm/cpuid.h
+++ b/elfloader-tool/include/arch-arm/cpuid.h
@@ -12,7 +12,7 @@
 uint32_t read_cpuid_id(void);
 
 /* read MP ID register from CPUID */
-uint32_t read_cpuid_mpidr(void);
+word_t read_cpuid_mpidr(void);
 
 /* check if CPU is in HYP/EL2 mode */
 word_t is_hyp_mode(void);
diff --git a/elfloader-tool/src/arch-arm/64/cpuid.c b/elfloader-tool/src/arch-arm/64/cpuid.c
index 66d9d09b..6c979a0f 100644
--- a/elfloader-tool/src/arch-arm/64/cpuid.c
+++ b/elfloader-tool/src/arch-arm/64/cpuid.c
@@ -6,6 +6,7 @@
 
 #include <armv/machine.h>
 #include <types.h>
+#include <cpuid.h>
 
 /* we only care about the affinity bits */
 #define MPIDR_MASK (0xff00ffffff)