diff --git a/common/cmd_dfu.c b/common/cmd_dfu.c
index d3658cf7ee93cc39e3d64951ab586f6b64a81f53..7ce92cec87f4fcb156b2d84ff487cb319635f6a4 100644
--- a/common/cmd_dfu.c
+++ b/common/cmd_dfu.c
@@ -9,10 +9,7 @@
  */
 
 #include <common.h>
-#include <command.h>
-#include <malloc.h>
 #include <dfu.h>
-#include <asm/errno.h>
 #include <g_dnl.h>
 
 static int do_dfu(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c
index 33a47150055fd9cae8725996dba3e0507e8c578c..ccf7195946e19491edb931d84cd4b159921112dc 100644
--- a/common/cmd_usb_mass_storage.c
+++ b/common/cmd_usb_mass_storage.c
@@ -5,7 +5,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <errno.h>
 #include <common.h>
 #include <command.h>
 #include <g_dnl.h>
diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
index 19011bf9fc268ae274b534173b1443a242c7be23..29d08a3a227304c62bd977a881610c9f8f46e7e2 100644
--- a/drivers/usb/gadget/g_dnl.c
+++ b/drivers/usb/gadget/g_dnl.c
@@ -7,7 +7,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <errno.h>
 #include <common.h>
 #include <malloc.h>
 
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 220d06860010c5d94e16531f498369b141aa2849..a8a576316d35257b1a39fe008a6d90df522583ef 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -18,6 +18,7 @@
 #ifndef __LINUX_USB_GADGET_H
 #define __LINUX_USB_GADGET_H
 
+#include <errno.h>
 #include <linux/list.h>
 
 struct usb_ep;