diff --git a/hello_world/Makefile b/hello_world/Makefile
index 0cbc69f..f7f9497 100644
--- a/hello_world/Makefile
+++ b/hello_world/Makefile
@@ -1,7 +1,7 @@
 ARCH = $(shell uname -m)
 ifneq ("$(ARCH)", "ppc64")
 ifneq ("$(ARCH)", "ppc64le")
-        CROSS_COMPILE = powerpc64le-linux-
+        CROSS_COMPILE ?= powerpc64le-linux-
         endif
         endif
 
diff --git a/hello_world/console.c b/hello_world/console.c
index 640eb48..f8e5441 100644
--- a/hello_world/console.c
+++ b/hello_world/console.c
@@ -1,8 +1,8 @@
-#include <unistd.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdbool.h>
 
+#include "console.h"
+
 /*
  * Core UART functions to implement for a port
  */
diff --git a/hello_world/console.h b/hello_world/console.h
index 85e7b36..fc64b91 100644
--- a/hello_world/console.h
+++ b/hello_world/console.h
@@ -1,3 +1,5 @@
+#include <stddef.h>
+
 void potato_uart_init(void);
 int getchar(void);
 void putchar(unsigned char c);
diff --git a/hello_world/hello_world.c b/hello_world/hello_world.c
index f1d1367..7e853d8 100644
--- a/hello_world/hello_world.c
+++ b/hello_world/hello_world.c
@@ -1,5 +1,3 @@
-#include <unistd.h>
-#include <string.h>
 #include <stdint.h>
 #include <stdbool.h>