diff --git a/ports/qemu-arm/main.c b/ports/qemu-arm/main.c
index 212fd6021517..025c1f17da04 100644
--- a/ports/qemu-arm/main.c
+++ b/ports/qemu-arm/main.c
@@ -24,18 +24,13 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
-#include <malloc.h>
 
-#include "py/obj.h"
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/stackctrl.h"
 #include "py/gc.h"
-#include "py/repl.h"
 #include "py/mperrno.h"
 
 void do_str(const char *src, mp_parse_input_kind_t input_kind) {
diff --git a/ports/qemu-arm/mphalport.h b/ports/qemu-arm/mphalport.h
index d854cd82d992..8a40505ba6b3 100644
--- a/ports/qemu-arm/mphalport.h
+++ b/ports/qemu-arm/mphalport.h
@@ -24,7 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include <stddef.h>
 #include "uart.h"
 
 #define mp_hal_stdin_rx_chr() (0)
diff --git a/ports/qemu-arm/test_main.c b/ports/qemu-arm/test_main.c
index 13d18bb0f094..96984f7cd16e 100644
--- a/ports/qemu-arm/test_main.c
+++ b/ports/qemu-arm/test_main.c
@@ -24,12 +24,8 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
-#include <malloc.h>
-#include <setjmp.h>
 
 #include "py/compile.h"
 #include "py/runtime.h"
diff --git a/ports/qemu-arm/uart.h b/ports/qemu-arm/uart.h
index b2b9e523cd60..33eae05bd76d 100644
--- a/ports/qemu-arm/uart.h
+++ b/ports/qemu-arm/uart.h
@@ -23,6 +23,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#ifndef MICROPY_INCLUDED_QEMU_ARM_UART_H
+#define MICROPY_INCLUDED_QEMU_ARM_UART_H
+
+#include <stddef.h>
 
 void uart_init(void);
 void uart_tx_strn(const char *buf, size_t len);
+
+#endif // MICROPY_INCLUDED_QEMU_ARM_UART_H