diff --git a/payloads/libpayload/drivers/usb/uhci.c b/payloads/libpayload/drivers/usb/uhci.c
index a558db842c..70bdc8f3df 100644
--- a/payloads/libpayload/drivers/usb/uhci.c
+++ b/payloads/libpayload/drivers/usb/uhci.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include "usb.h"
+#include <usb/usb.h>
 #include "uhci.h"
 #include <arch/virtual.h>
 
diff --git a/payloads/libpayload/drivers/usb/uhci.h b/payloads/libpayload/drivers/usb/uhci.h
index f5727c4e61..0f56ff4180 100644
--- a/payloads/libpayload/drivers/usb/uhci.h
+++ b/payloads/libpayload/drivers/usb/uhci.h
@@ -31,7 +31,7 @@
 #define __UHCI_H
 
 #include <pci.h>
-#include "usb.h"
+#include <usb/usb.h>
 
 typedef union {
 	struct {
diff --git a/payloads/libpayload/drivers/usb/usb.c b/payloads/libpayload/drivers/usb/usb.c
index fc4de87dd7..62619d6d89 100644
--- a/payloads/libpayload/drivers/usb/usb.c
+++ b/payloads/libpayload/drivers/usb/usb.c
@@ -28,7 +28,7 @@
  */
 
 #include <config.h>
-#include "usb.h"
+#include <usb/usb.h>
 
 hci_t *usb_hcs = 0;
 
diff --git a/payloads/libpayload/drivers/usb/usb_dev.c b/payloads/libpayload/drivers/usb/usb_dev.c
index 0c6a34ca10..9a0aecda7b 100644
--- a/payloads/libpayload/drivers/usb/usb_dev.c
+++ b/payloads/libpayload/drivers/usb/usb_dev.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include "usb.h"
+#include <usb/usb.h>
 
 static void
 usb_nop_destroy (usbdev_t *dev)
diff --git a/payloads/libpayload/drivers/usb/usbhid.c b/payloads/libpayload/drivers/usb/usbhid.c
index 414cc07cdb..34e7cdb635 100644
--- a/payloads/libpayload/drivers/usb/usbhid.c
+++ b/payloads/libpayload/drivers/usb/usbhid.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include "usb.h"
+#include <usb/usb.h>
 
 enum { hid_subclass_none = 0, hid_subclass_boot = 1 };
 enum { hid_proto_boot = 0, hid_proto_report = 1 };
diff --git a/payloads/libpayload/drivers/usb/usbhub.c b/payloads/libpayload/drivers/usb/usbhub.c
index 04c04c383a..ce1523302d 100644
--- a/payloads/libpayload/drivers/usb/usbhub.c
+++ b/payloads/libpayload/drivers/usb/usbhub.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include "usb.h"
+#include <usb/usb.h>
 
 // assume that host_to_device is overwritten if necessary
 #define DR_PORT gen_bmRequestType(host_to_device, class_type, other_recp)
diff --git a/payloads/libpayload/drivers/usb/usbinit.c b/payloads/libpayload/drivers/usb/usbinit.c
index fe13837c51..851aa3c9d9 100644
--- a/payloads/libpayload/drivers/usb/usbinit.c
+++ b/payloads/libpayload/drivers/usb/usbinit.c
@@ -28,9 +28,9 @@
  */
 
 #include <config.h>
-#include "usb.h"
+#include <usb/usb.h>
 #include "uhci.h"
-#include "usbdisk.h"
+#include <usb/usbdisk.h>
 
 /**
  * Initializes USB controller attached to PCI
diff --git a/payloads/libpayload/drivers/usb/usbmsc.c b/payloads/libpayload/drivers/usb/usbmsc.c
index cbef585e24..c25c617a83 100644
--- a/payloads/libpayload/drivers/usb/usbmsc.c
+++ b/payloads/libpayload/drivers/usb/usbmsc.c
@@ -28,9 +28,9 @@
  */
 
 #include <arch/endian.h>
-#include "usb.h"
-#include "usbmsc.h"
-#include "usbdisk.h"
+#include <usb/usb.h>
+#include <usb/usbmsc.h>
+#include <usb/usbdisk.h>
 
 enum {
 	msc_subclass_rbc = 0x1,