diff --git a/src/basecmd.c b/src/basecmd.c
index 4902bd9d..fd80abfd 100644
--- a/src/basecmd.c
+++ b/src/basecmd.c
@@ -5,7 +5,7 @@
 // This file may be distributed under the terms of the GNU GPLv3 license.
 
 #include <stdlib.h> // malloc
-#include <string.h> // memcpy
+#include <string.h> // memset
 #include "basecmd.h" // lookup_oid
 #include "board/irq.h" // irq_save
 #include "board/misc.h" // alloc_maxsize
diff --git a/src/endstop.c b/src/endstop.c
index c8aa58e6..fc63f123 100644
--- a/src/endstop.c
+++ b/src/endstop.c
@@ -4,7 +4,6 @@
 //
 // This file may be distributed under the terms of the GNU GPLv3 license.
 
-#include <stddef.h> // offsetof
 #include "basecmd.h" // alloc_oid
 #include "board/gpio.h" // struct gpio
 #include "board/irq.h" // irq_disable
diff --git a/src/sched.c b/src/sched.c
index a5064650..eb35bc8e 100644
--- a/src/sched.c
+++ b/src/sched.c
@@ -5,8 +5,6 @@
 // This file may be distributed under the terms of the GNU GPLv3 license.
 
 #include <setjmp.h> // setjmp
-#include <stdarg.h> // va_list
-#include <stddef.h> // NULL
 #include "autoconf.h" // CONFIG_*
 #include "board/irq.h" // irq_save
 #include "board/misc.h" // timer_from_us
diff --git a/src/stepper.c b/src/stepper.c
index 8da71e84..23a073b1 100644
--- a/src/stepper.c
+++ b/src/stepper.c
@@ -4,7 +4,6 @@
 //
 // This file may be distributed under the terms of the GNU GPLv3 license.
 
-#include <stddef.h> // NULL
 #include "autoconf.h" // CONFIG_*
 #include "basecmd.h" // alloc_oid
 #include "board/gpio.h" // gpio_out_write