3 files changed, 5 insertions, 3 deletions
diff --git a/src/interface/linux/linux_acpi.c b/src/interface/linux/linux_acpi.c
index a2a8bf12e..21a2e27cc 100644
--- a/src/interface/linux/linux_acpi.c
+++ b/src/interface/linux/linux_acpi.c
@@ -21,6 +21,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <errno.h>
 #include <ipxe/linux_api.h>
 #include <ipxe/linux_sysfs.h>
diff --git a/src/interface/linux/linux_smbios.c b/src/interface/linux/linux_smbios.c
index a12c936ed..1450fcf1b 100644
--- a/src/interface/linux/linux_smbios.c
+++ b/src/interface/linux/linux_smbios.c
@@ -19,6 +19,7 @@
 
 FILE_LICENCE ( GPL2_OR_LATER );
 
+#include <string.h>
 #include <errno.h>
 #include <ipxe/linux_api.h>
 #include <ipxe/linux_sysfs.h>
diff --git a/src/interface/linux/linux_sysfs.c b/src/interface/linux/linux_sysfs.c
index cbb23d81d..321824ba9 100644
--- a/src/interface/linux/linux_sysfs.c
+++ b/src/interface/linux/linux_sysfs.c
@@ -42,8 +42,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
  * @v data		Data to fill in
  * @ret len		Length read, or negative error
  */
-int linux_sysfs_read ( const char *filename, userptr_t *data ) {
-	userptr_t tmp;
+int linux_sysfs_read ( const char *filename, void **data ) {
+	void *tmp;
 	ssize_t read;
 	size_t len;
 	int fd;
@@ -59,7 +59,7 @@ int linux_sysfs_read ( const char *filename, userptr_t *data ) {
 	}
 
 	/* Read file */
-	for ( *data = UNULL, len = 0 ; ; len += read ) {
+	for ( *data = NULL, len = 0 ; ; len += read ) {
 
 		/* (Re)allocate space */
 		tmp = urealloc ( *data, ( len + LINUX_SYSFS_BLKSIZE ) );