diff --git a/hwaccess_physmap.c b/hwaccess_physmap.c
index 81adf18e9..f95b5f647 100644
--- a/hwaccess_physmap.c
+++ b/hwaccess_physmap.c
@@ -121,7 +121,7 @@ static void sys_physunmap_unaligned(void *virt_addr, size_t len)
 
 #define MEM_DEV ""
 
-void *sys_physmap(uintptr_t phys_addr, size_t len)
+static void *sys_physmap(uintptr_t phys_addr, size_t len)
 {
 	return (void *)phys_to_virt(phys_addr);
 }
diff --git a/hwaccess_x86_io.c b/hwaccess_x86_io.c
index c3ad31396..a883ed418 100644
--- a/hwaccess_x86_io.c
+++ b/hwaccess_x86_io.c
@@ -134,6 +134,8 @@
 #endif
 
 #if defined(__LIBPAYLOAD__)
+#include <arch/io.h>
+
 #define IO_PORT_PERMISSION USE_DUMMY
 #define IO_PORT_FUNCTION USE_LIBC_TARGET_LAST
 #endif