diff --git a/sw/device/lib/usb_controlep.h b/sw/device/lib/usb_controlep.h
index b10d8df..edaefa8 100644
--- a/sw/device/lib/usb_controlep.h
+++ b/sw/device/lib/usb_controlep.h
@@ -5,8 +5,10 @@
 #ifndef __USB_CONTROLEP_H__
 #define __USB_CONTROLEP_H__
 
-#include "sw/device/lib/common.h"
-#include "usbdev.h"
+#include <stddef.h>
+#include <stdint.h>
+
+#include "sw/device/lib/usbdev.h"
 
 typedef enum ctstate {
   kCtIdle,