diff --git a/TESTS/events/queue/main.cpp b/TESTS/events/queue/main.cpp
index 4bde3c8e230..fd4b098c505 100644
--- a/TESTS/events/queue/main.cpp
+++ b/TESTS/events/queue/main.cpp
@@ -25,6 +25,8 @@
 #endif
 
 using namespace utest::v1;
+using events::EventQueue;
+using events::Event;
 
 // Assume that tolerance is 5% of measured time.
 #define DELTA(ms) (ms / 20)
diff --git a/TESTS/netsocket/dns/asynchronous_dns_external_event_queue.cpp b/TESTS/netsocket/dns/asynchronous_dns_external_event_queue.cpp
index 11291f5e937..1f7303e2691 100644
--- a/TESTS/netsocket/dns/asynchronous_dns_external_event_queue.cpp
+++ b/TESTS/netsocket/dns/asynchronous_dns_external_event_queue.cpp
@@ -24,6 +24,7 @@
 #include "nsapi_dns.h"
 
 using namespace utest::v1;
+using events::EventQueue;
 
 namespace {
 int result_ok;
@@ -34,7 +35,7 @@ int result_exp_timeout;
 const int EXTERNAL_THREAD_SIZE = 2048;
 const int EVENT_QUEUE_SIZE = 10;
 
-events::EventQueue *event_queue;
+EventQueue *event_queue;
 }
 
 static nsapi_error_t event_queue_call(int delay, mbed::Callback<void()> func)
diff --git a/TESTS/netsocket/dns/asynchronous_dns_timeouts.cpp b/TESTS/netsocket/dns/asynchronous_dns_timeouts.cpp
index 37401df1e9e..415203b509e 100644
--- a/TESTS/netsocket/dns/asynchronous_dns_timeouts.cpp
+++ b/TESTS/netsocket/dns/asynchronous_dns_timeouts.cpp
@@ -24,6 +24,7 @@
 #include "nsapi_dns.h"
 
 using namespace utest::v1;
+using events::EventQueue;
 
 namespace {
 int result_ok;
@@ -34,7 +35,7 @@ int result_exp_timeout;
 const int EXTERNAL_THREAD_SIZE = 2048;
 const int EVENT_QUEUE_SIZE = 10;
 
-events::EventQueue *event_queue;
+EventQueue *event_queue;
 }
 
 static nsapi_error_t event_queue_call(int delay, mbed::Callback<void()> func)
diff --git a/TESTS/netsocket/dns/main.cpp b/TESTS/netsocket/dns/main.cpp
index e8ae973532b..7af451f4eb8 100644
--- a/TESTS/netsocket/dns/main.cpp
+++ b/TESTS/netsocket/dns/main.cpp
@@ -26,7 +26,6 @@
 #include "unity.h"
 #include "utest.h"
 #include "nsapi_dns.h"
-#include "EventQueue.h"
 #include "dns_tests.h"
 
 using namespace utest::v1;
diff --git a/TESTS/usb_device/basic/USBEndpointTester.cpp b/TESTS/usb_device/basic/USBEndpointTester.cpp
index 8085dc0c1dc..acf7af65cd9 100644
--- a/TESTS/usb_device/basic/USBEndpointTester.cpp
+++ b/TESTS/usb_device/basic/USBEndpointTester.cpp
@@ -167,7 +167,7 @@ USBEndpointTester::USBEndpointTester(USBPhy *phy, uint16_t vendor_id, uint16_t p
     }
     MBED_ASSERT(resolver.valid());
 
-    queue = mbed_highprio_event_queue();
+    queue = mbed::mbed_highprio_event_queue();
     configuration_desc(0);
     init();
     USBDevice::connect();
diff --git a/TESTS/usb_device/basic/USBEndpointTester.h b/TESTS/usb_device/basic/USBEndpointTester.h
index 3b0afef66c9..6effd1f9b52 100644
--- a/TESTS/usb_device/basic/USBEndpointTester.h
+++ b/TESTS/usb_device/basic/USBEndpointTester.h
@@ -54,7 +54,7 @@ class USBEndpointTester: public USBDevice {
     };
 
 protected:
-    EventQueue *queue;
+    events::EventQueue *queue;
     rtos::EventFlags flags;
     uint8_t ctrl_buf[2048];
 
diff --git a/TESTS/usb_device/basic/USBTester.cpp b/TESTS/usb_device/basic/USBTester.cpp
index 36b01d9eeb0..93cc892ffbe 100644
--- a/TESTS/usb_device/basic/USBTester.cpp
+++ b/TESTS/usb_device/basic/USBTester.cpp
@@ -54,7 +54,7 @@ USBTester::USBTester(USBPhy *phy, uint16_t vendor_id, uint16_t product_id, uint1
     int_in = resolver.endpoint_in(USB_EP_TYPE_INT, 64);
     int_out = resolver.endpoint_out(USB_EP_TYPE_INT, 64);
     MBED_ASSERT(resolver.valid());
-    queue = mbed_highprio_event_queue();
+    queue = mbed::mbed_highprio_event_queue();
 
     configuration_desc(0);
 
diff --git a/TESTS/usb_device/basic/USBTester.h b/TESTS/usb_device/basic/USBTester.h
index f94f771f372..ac3554e8378 100644
--- a/TESTS/usb_device/basic/USBTester.h
+++ b/TESTS/usb_device/basic/USBTester.h
@@ -106,7 +106,7 @@ class USBTester: public USBDevice {
     uint8_t int_in;
     uint8_t int_out;
     uint8_t int_buf[64];
-    EventQueue *queue;
+    events::EventQueue *queue;
     rtos::EventFlags flags;
     volatile uint32_t reset_count;
     volatile uint32_t suspend_count;
diff --git a/usb/device/USBAudio/USBAudio.cpp b/usb/device/USBAudio/USBAudio.cpp
index 71d392e9998..84d1da77714 100644
--- a/usb/device/USBAudio/USBAudio.cpp
+++ b/usb/device/USBAudio/USBAudio.cpp
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-#include "stdint.h"
 #include "USBAudio.h"
 #include "USBAudio_Types.h"
 #include "EndpointResolver.h"
 #include "usb_phy_api.h"
 
+using mbed::Callback;
+using mbed::callback;
+
 #define SAMPLE_SIZE                 2
 #define XFER_FREQUENCY_HZ           1000
 #define WRITE_READY_UNBLOCK         (1 << 0)
diff --git a/usb/device/USBAudio/USBAudio.h b/usb/device/USBAudio/USBAudio.h
index d2ed6aea68d..90b7cd00c24 100644
--- a/usb/device/USBAudio/USBAudio.h
+++ b/usb/device/USBAudio/USBAudio.h
@@ -222,21 +222,21 @@ class USBAudio: protected USBDevice {
      * @param cb Callback to attach
      *
      */
-    void attach(Callback<void()> &cb);
+    void attach(mbed::Callback<void()> &cb);
 
     /** attach a Callback to Tx Done
      *
      * @param cb Callback to attach
      *
      */
-    void attach_tx(Callback<void(AudioEvent)> &cb);
+    void attach_tx(mbed::Callback<void(AudioEvent)> &cb);
 
     /** attach a Callback to Rx Done
      *
      * @param cb Callback to attach
      *
      */
-    void attach_rx(Callback<void(AudioEvent)> &cb);
+    void attach_rx(mbed::Callback<void(AudioEvent)> &cb);
 
 protected:
 
@@ -303,13 +303,13 @@ class USBAudio: protected USBDevice {
     uint16_t _vol_res;
 
     // callback to update volume
-    Callback<void()> _update_vol;
+    mbed::Callback<void()> _update_vol;
 
     // callback transmit Done
-    Callback<void(AudioEvent)> _tx_done;
+    mbed::Callback<void(AudioEvent)> _tx_done;
 
     // callback receive Done
-    Callback<void(AudioEvent)> _rx_done;
+    mbed::Callback<void(AudioEvent)> _rx_done;
 
     // Number of times data was dropped due to an overflow
     uint32_t _rx_overflow;
diff --git a/usb/device/USBDevice/EndpointResolver.cpp b/usb/device/USBDevice/EndpointResolver.cpp
index 05ced02866a..d9ae07af700 100644
--- a/usb/device/USBDevice/EndpointResolver.cpp
+++ b/usb/device/USBDevice/EndpointResolver.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include "mbed.h"
 #include "EndpointResolver.h"
 
 static uint32_t logical_to_index(uint32_t logical, bool in_not_out)
diff --git a/usb/device/USBDevice/EndpointResolver.h b/usb/device/USBDevice/EndpointResolver.h
index a0a9a93e8fc..7c0eb4a4fdc 100644
--- a/usb/device/USBDevice/EndpointResolver.h
+++ b/usb/device/USBDevice/EndpointResolver.h
@@ -17,8 +17,6 @@
 #ifndef ENDPOINT_RESOLVER_H
 #define ENDPOINT_RESOLVER_H
 
-#include "mbed.h"
-
 #include "USBPhy.h"
 
 /**
diff --git a/usb/device/USBDevice/USBDevice.cpp b/usb/device/USBDevice/USBDevice.cpp
index d2327ba5b19..e1e9edc1a0b 100644
--- a/usb/device/USBDevice/USBDevice.cpp
+++ b/usb/device/USBDevice/USBDevice.cpp
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#include "stdint.h"
-
 #include "USBDevice.h"
 #include "USBDescriptor.h"
 #include "usb_phy_api.h"
+#include "mbed_critical.h"
+#include "mbed_assert.h"
+#include <string.h> // memset
 
 //#define DEBUG
 
diff --git a/usb/device/USBDevice/USBDevice.h b/usb/device/USBDevice/USBDevice.h
index 5831df48b79..a50261fedd5 100644
--- a/usb/device/USBDevice/USBDevice.h
+++ b/usb/device/USBDevice/USBDevice.h
@@ -17,10 +17,9 @@
 #ifndef USBDEVICE_H
 #define USBDEVICE_H
 
-#include "mbed.h"
 #include "USBDevice_Types.h"
 #include "USBPhy.h"
-#include "mbed_critical.h"
+#include <stdlib.h> // NULL
 
 /**
  * \defgroup usb_device USB Device
diff --git a/usb/device/USBHID/USBHID.cpp b/usb/device/USBHID/USBHID.cpp
index f2d73c3e061..8af20708485 100644
--- a/usb/device/USBHID/USBHID.cpp
+++ b/usb/device/USBHID/USBHID.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include "stdint.h"
 #include "USBHID.h"
 #include "EndpointResolver.h"
 #include "usb_phy_api.h"
diff --git a/usb/device/USBHID/USBKeyboard.cpp b/usb/device/USBHID/USBKeyboard.cpp
index 5a9cd9ce467..68688d7e443 100644
--- a/usb/device/USBHID/USBKeyboard.cpp
+++ b/usb/device/USBHID/USBKeyboard.cpp
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include "stdint.h"
-
 #include "USBKeyboard.h"
 #include "usb_phy_api.h"
 
diff --git a/usb/device/USBHID/USBKeyboard.h b/usb/device/USBHID/USBKeyboard.h
index d2f8a765a82..a78b1438f8a 100644
--- a/usb/device/USBHID/USBKeyboard.h
+++ b/usb/device/USBHID/USBKeyboard.h
@@ -94,7 +94,7 @@ enum FUNCTION_KEY {
  *
  * @note Synchronization level: Thread safe
  */
-class USBKeyboard: public USBHID, public Stream {
+class USBKeyboard: public USBHID, public mbed::Stream {
 public:
 
     /**
diff --git a/usb/device/USBHID/USBMouse.cpp b/usb/device/USBHID/USBMouse.cpp
index 902e9e72f7f..9c6c298f722 100644
--- a/usb/device/USBHID/USBMouse.cpp
+++ b/usb/device/USBHID/USBMouse.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "stdint.h"
 #include "USBMouse.h"
-#include "PlatformMutex.h"
 #include "usb_phy_api.h"
+#include "PlatformMutex.h"
+#include "mbed_wait_api.h"
 
 
 USBMouse::USBMouse(bool connect_blocking, MOUSE_TYPE mouse_type, uint16_t vendor_id, uint16_t product_id, uint16_t product_release):
@@ -155,7 +155,7 @@ bool USBMouse::double_click()
         _mutex.unlock();
         return false;
     }
-    wait(0.1);
+    wait_ms(100);
     bool ret = click(MOUSE_LEFT);
 
     _mutex.unlock();
@@ -170,7 +170,7 @@ bool USBMouse::click(uint8_t button)
         _mutex.unlock();
         return false;
     }
-    wait(0.01);
+    wait_ms(10);
     bool ret = update(0, 0, 0, 0);
 
     _mutex.unlock();
diff --git a/usb/device/USBHID/USBMouseKeyboard.cpp b/usb/device/USBHID/USBMouseKeyboard.cpp
index 4d9e4b990d8..2c6829d0eee 100644
--- a/usb/device/USBHID/USBMouseKeyboard.cpp
+++ b/usb/device/USBHID/USBMouseKeyboard.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "stdint.h"
 #include "USBMouseKeyboard.h"
 #include "usb_phy_api.h"
+#include "mbed_wait_api.h"
 
 typedef struct {
     unsigned char usage;
@@ -707,7 +707,7 @@ bool USBMouseKeyboard::doubleClick()
         _mutex.unlock();
         return false;
     }
-    wait(0.1);
+    wait_ms(100);
     bool ret = click(MOUSE_LEFT);
 
     _mutex.unlock();
@@ -722,7 +722,7 @@ bool USBMouseKeyboard::click(uint8_t button)
         _mutex.unlock();
         return false;
     }
-    wait(0.01);
+    wait_ms(10);
     bool ret = update(0, 0, 0, 0);
 
     _mutex.unlock();
diff --git a/usb/device/USBHID/USBMouseKeyboard.h b/usb/device/USBHID/USBMouseKeyboard.h
index 75595e231b6..d8b9d39c510 100644
--- a/usb/device/USBHID/USBMouseKeyboard.h
+++ b/usb/device/USBHID/USBMouseKeyboard.h
@@ -68,7 +68,7 @@
  *
  * @note Synchronization level: Thread safe
  */
-class USBMouseKeyboard: public USBHID, public Stream
+class USBMouseKeyboard: public USBHID, public mbed::Stream
 {
 public:
 
diff --git a/usb/device/USBMIDI/USBMIDI.cpp b/usb/device/USBMIDI/USBMIDI.cpp
index 24cceff1f49..f541b66b1de 100644
--- a/usb/device/USBMIDI/USBMIDI.cpp
+++ b/usb/device/USBMIDI/USBMIDI.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include "stdint.h"
 #include "USBMIDI.h"
 #include "EndpointResolver.h"
 #include "usb_phy_api.h"
diff --git a/usb/device/USBMSD/USBMSD.cpp b/usb/device/USBMSD/USBMSD.cpp
index 79020201c0e..2b4f92d8d3c 100644
--- a/usb/device/USBMSD/USBMSD.cpp
+++ b/usb/device/USBMSD/USBMSD.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-#include "stdint.h"
 #include "USBMSD.h"
 #include "EndpointResolver.h"
 #include "usb_phy_api.h"
+#include "BlockDevice.h"
+#include <stdlib.h>
 
 #define DISK_OK         0x00
 #define NO_INIT         0x01
@@ -86,6 +87,8 @@ void USBMSD::_init()
 {
     _bd->init();
 
+    using mbed::callback;
+
     _in_task = callback(this, &USBMSD::_in);
     _out_task = callback(this, &USBMSD::_out);
     _reset_task = callback(this, &USBMSD::_reset);
diff --git a/usb/device/USBMSD/USBMSD.h b/usb/device/USBMSD/USBMSD.h
index d0584156fd4..b1bffd4b3e6 100644
--- a/usb/device/USBMSD/USBMSD.h
+++ b/usb/device/USBMSD/USBMSD.h
@@ -23,11 +23,12 @@
 #include "platform/Callback.h"
 #include "events/PolledQueue.h"
 #include "events/Task.h"
-#include "BlockDevice.h"
 #include "Mutex.h"
 
 #include "USBDevice.h"
 
+class BlockDevice;
+
 /**
  * USBMSD class: generic class in order to use all kinds of blocks storage chip
  *
@@ -237,12 +238,12 @@ class USBMSD: public USBDevice {
     uint32_t _bulk_out_size;
 
     // Interrupt to thread deferral
-    PolledQueue _queue;
-    Task<void()> _in_task;
-    Task<void()> _out_task;
-    Task<void()> _reset_task;
-    Task<void(const setup_packet_t *)> _control_task;
-    Task<void()> _configure_task;
+    events::PolledQueue _queue;
+    events::Task<void()> _in_task;
+    events::Task<void()> _out_task;
+    events::Task<void()> _reset_task;
+    events::Task<void(const setup_packet_t *)> _control_task;
+    events::Task<void()> _configure_task;
 
     BlockDevice *_bd;
     rtos::Mutex _mutex_init;
diff --git a/usb/device/USBSerial/USBCDC.cpp b/usb/device/USBSerial/USBCDC.cpp
index 7e406c419e1..788bfa1906e 100644
--- a/usb/device/USBSerial/USBCDC.cpp
+++ b/usb/device/USBSerial/USBCDC.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include "stdint.h"
 #include "USBCDC.h"
 #include "EndpointResolver.h"
 #include "AsyncOp.h"
diff --git a/usb/device/USBSerial/USBCDC.h b/usb/device/USBSerial/USBCDC.h
index b08c9bcf0a5..0731c160f56 100644
--- a/usb/device/USBSerial/USBCDC.h
+++ b/usb/device/USBSerial/USBCDC.h
@@ -127,7 +127,7 @@ class USBCDC: public USBDevice {
 
 protected:
     /*
-    * Get device descriptor. Warning: this method has to store the length of the report descriptor in reportLength.
+    * Get device descriptor
     *
     * @returns pointer to the device descriptor
     */
diff --git a/usb/device/USBSerial/USBSerial.cpp b/usb/device/USBSerial/USBSerial.cpp
index b691b2f977e..ad60f102fe3 100644
--- a/usb/device/USBSerial/USBSerial.cpp
+++ b/usb/device/USBSerial/USBSerial.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include "stdint.h"
 #include "USBSerial.h"
 #include "usb_phy_api.h"
 
diff --git a/usb/device/USBSerial/USBSerial.h b/usb/device/USBSerial/USBSerial.h
index f06eb2e8171..d393a297cac 100644
--- a/usb/device/USBSerial/USBSerial.h
+++ b/usb/device/USBSerial/USBSerial.h
@@ -41,7 +41,7 @@
 * }
 * @endcode
 */
-class USBSerial: public USBCDC, public Stream {
+class USBSerial: public USBCDC, public mbed::Stream {
 public:
 
     /**
@@ -149,7 +149,7 @@ class USBSerial: public USBCDC, public Stream {
         USBCDC::lock();
 
         if ((mptr != NULL) && (tptr != NULL)) {
-            rx = Callback<void()>(mptr, tptr);
+            rx = mbed::Callback<void()>(mptr, tptr);
         }
 
         USBCDC::unlock();
@@ -165,7 +165,7 @@ class USBSerial: public USBCDC, public Stream {
         USBCDC::lock();
 
         if (fptr != NULL) {
-            rx = Callback<void()>(fptr);
+            rx = mbed::Callback<void()>(fptr);
         }
 
         USBCDC::unlock();
@@ -176,7 +176,7 @@ class USBSerial: public USBCDC, public Stream {
      *
      * @param cb Callback to attach
      */
-    void attach(Callback<void()> &cb)
+    void attach(mbed::Callback<void()> &cb)
     {
         USBCDC::lock();
 
@@ -211,7 +211,7 @@ class USBSerial: public USBCDC, public Stream {
     }
 
 private:
-    Callback<void()> rx;
+    mbed::Callback<void()> rx;
     void (*_settings_changed_callback)(int baud, int bits, int parity, int stop);
 };
 
diff --git a/usb/device/targets/TARGET_Freescale/USBPhyHw.h b/usb/device/targets/TARGET_Freescale/USBPhyHw.h
index 7bf1fee22f0..d20bd2dce53 100644
--- a/usb/device/targets/TARGET_Freescale/USBPhyHw.h
+++ b/usb/device/targets/TARGET_Freescale/USBPhyHw.h
@@ -17,7 +17,6 @@
 #ifndef USBPHYHW_H
 #define USBPHYHW_H
 
-#include "mbed.h"
 #include "USBPhy.h"
 
 
diff --git a/usb/device/targets/TARGET_Freescale/USBPhy_Kinetis.cpp b/usb/device/targets/TARGET_Freescale/USBPhy_Kinetis.cpp
index 16b0cd28569..1bb27fac255 100644
--- a/usb/device/targets/TARGET_Freescale/USBPhy_Kinetis.cpp
+++ b/usb/device/targets/TARGET_Freescale/USBPhy_Kinetis.cpp
@@ -26,6 +26,7 @@
 #include "USBPhyHw.h"
 #include "USBEndpoints_Kinetis.h"
 #include "mbed_critical.h"
+#include "mbed_toolchain.h"
 
 static USBPhyHw *instance;
 
diff --git a/usb/device/targets/TARGET_NXP/USBHAL_LPC17.cpp b/usb/device/targets/TARGET_NXP/USBHAL_LPC17.cpp
index 6cfc629a51a..38553350134 100644
--- a/usb/device/targets/TARGET_NXP/USBHAL_LPC17.cpp
+++ b/usb/device/targets/TARGET_NXP/USBHAL_LPC17.cpp
@@ -20,6 +20,7 @@
 #include "USBEndpoints_LPC17_LPC23.h"
 #include "USBPhyHw.h"
 #include "usb_phy_api.h"
+#include "mbed_wait_api.h"
 
 
 // Get endpoint direction
@@ -408,7 +409,7 @@ void USBPhyHw::init(USBPhyEvents *events)
     LPC_PINCON->PINSEL4 |= 0x00040000;
 
     // Connect must be low for at least 2.5uS
-    wait(0.3);
+    wait_ms(300);
 
     // Disable control endpoints
     SIEsetEndpointStatus(EP0IN, SIE_SES_DA);
diff --git a/usb/device/targets/TARGET_NXP/USBPhyHw.h b/usb/device/targets/TARGET_NXP/USBPhyHw.h
index ad2ca502c52..ae92a6c9b12 100644
--- a/usb/device/targets/TARGET_NXP/USBPhyHw.h
+++ b/usb/device/targets/TARGET_NXP/USBPhyHw.h
@@ -17,7 +17,6 @@
 #ifndef USBPHYHW_H
 #define USBPHYHW_H
 
-#include "mbed.h"
 #include "USBPhy.h"
 
 
diff --git a/usb/device/targets/TARGET_STM/USBPhyHw.h b/usb/device/targets/TARGET_STM/USBPhyHw.h
index 68c3ccb876d..9f128a74634 100644
--- a/usb/device/targets/TARGET_STM/USBPhyHw.h
+++ b/usb/device/targets/TARGET_STM/USBPhyHw.h
@@ -17,7 +17,6 @@
 #ifndef USBPHYHW_H
 #define USBPHYHW_H
 
-#include "mbed.h"
 #include "USBPhy.h"
 
 #if defined(TARGET_DISCO_F746NG)
diff --git a/usb/device/targets/TARGET_Template/USBPhyHw.h b/usb/device/targets/TARGET_Template/USBPhyHw.h
index ce6cc124ba6..2df1849721e 100644
--- a/usb/device/targets/TARGET_Template/USBPhyHw.h
+++ b/usb/device/targets/TARGET_Template/USBPhyHw.h
@@ -17,7 +17,6 @@
 #ifndef USBPHYHW_H
 #define USBPHYHW_H
 
-#include "mbed.h"
 #include "USBPhy.h"
 
 
diff --git a/usb/device/utilities/LinkedList.h b/usb/device/utilities/LinkedList.h
index 41a6f35d7ee..2f42bb04cfd 100644
--- a/usb/device/utilities/LinkedList.h
+++ b/usb/device/utilities/LinkedList.h
@@ -17,7 +17,6 @@
 #ifndef MBED_LINKED_LIST_H
 #define MBED_LINKED_LIST_H
 
-#include "LinkEntry.h"
 #include "LinkedListBase.h"
 
 template<class T>
diff --git a/usb/device/utilities/OperationListBase.h b/usb/device/utilities/OperationListBase.h
index c3f903f794e..c223d7e1b96 100644
--- a/usb/device/utilities/OperationListBase.h
+++ b/usb/device/utilities/OperationListBase.h
@@ -18,7 +18,6 @@
 #define MBED_OPERATION_LIST_BASE_H
 
 #include "LinkedListBase.h"
-#include "Mutex.h"
 
 class AsyncOp;
 
diff --git a/usb/device/utilities/events/PolledQueue.cpp b/usb/device/utilities/events/PolledQueue.cpp
index 562f5f345db..3db74e04136 100644
--- a/usb/device/utilities/events/PolledQueue.cpp
+++ b/usb/device/utilities/events/PolledQueue.cpp
@@ -16,7 +16,7 @@
 #include "events/PolledQueue.h"
 
 #include "events/mbed_events.h"
-#include "platform/Callback.h"
+#include "mbed_critical.h"
 
 
 PolledQueue::PolledQueue(mbed::Callback<void()> cb): _cb(cb)
diff --git a/usb/device/utilities/events/Task.h b/usb/device/utilities/events/Task.h
index 1d51ac12e66..f6b3e130f69 100644
--- a/usb/device/utilities/events/Task.h
+++ b/usb/device/utilities/events/Task.h
@@ -19,7 +19,6 @@
 
 #include "events/EventQueue.h"
 #include "events/TaskBase.h"
-#include "platform/mbed_assert.h"
 #include "platform/Callback.h"
 
 namespace events {
diff --git a/usb/device/utilities/events/TaskBase.cpp b/usb/device/utilities/events/TaskBase.cpp
index ce974f529f0..f85bdf35a9f 100644
--- a/usb/device/utilities/events/TaskBase.cpp
+++ b/usb/device/utilities/events/TaskBase.cpp
@@ -18,7 +18,7 @@
 #include "events/TaskQueue.h"
 #include "events/mbed_events.h"
 #include "rtos/Semaphore.h"
-#include "mbed.h"
+#include "mbed_critical.h"
 
 TaskBase::TaskBase(TaskQueue *q)
     : _queue(q), _posted(false), _start_count(0), _flush_sem(NULL)
diff --git a/usb/device/utilities/events/TaskBase.h b/usb/device/utilities/events/TaskBase.h
index a4ce4c9cdba..08d88fb8db9 100644
--- a/usb/device/utilities/events/TaskBase.h
+++ b/usb/device/utilities/events/TaskBase.h
@@ -16,9 +16,8 @@
 #ifndef TASK_BASE_H
 #define TASK_BASE_H
 
-#include "platform/Callback.h"
-#include "platform/mbed_assert.h"
 #include "LinkEntry.h"
+#include <stdint.h>
 
 namespace rtos {
 class Semaphore;
diff --git a/usb/device/utilities/events/TaskQueue.h b/usb/device/utilities/events/TaskQueue.h
index 521876c11e6..afcbedaa13c 100644
--- a/usb/device/utilities/events/TaskQueue.h
+++ b/usb/device/utilities/events/TaskQueue.h
@@ -18,8 +18,6 @@
 #define TASK_QUEUE_H
 
 #include "events/TaskBase.h"
-#include "platform/Callback.h"
-#include "mbed_critical.h"
 
 #define MBED_MAX_TASK_SIZE  32