diff --git a/events/EventQueue.cpp b/events/EventQueue.cpp
index fae08f2957..f04917c4ef 100644
--- a/events/EventQueue.cpp
+++ b/events/EventQueue.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 #include "events/EventQueue.h"
-
 #include "events/mbed_events.h"
-#include "mbed.h"
 
+using mbed::Callback;
+
+namespace events {
 
 EventQueue::EventQueue(unsigned event_size, unsigned char *event_pointer)
 {
@@ -77,3 +78,4 @@ void EventQueue::chain(EventQueue *target)
         equeue_chain(&_equeue, 0);
     }
 }
+}
diff --git a/events/equeue/equeue_mbed.cpp b/events/equeue/equeue_mbed.cpp
index 79ca4c8318..ba4156d601 100644
--- a/events/equeue/equeue_mbed.cpp
+++ b/events/equeue/equeue_mbed.cpp
@@ -21,7 +21,16 @@
 #if defined(EQUEUE_PLATFORM_MBED)
 
 #include <stdbool.h>
-#include "mbed.h"
+#include <string.h>
+#include "platform/mbed_critical.h"
+#include "drivers/Timer.h"
+#include "drivers/Ticker.h"
+#include "drivers/Timeout.h"
+#include "drivers/LowPowerTimeout.h"
+#include "drivers/LowPowerTicker.h"
+#include "drivers/LowPowerTimer.h"
+
+using namespace mbed;
 
 // Ticker operations
 #if MBED_CONF_RTOS_PRESENT
@@ -33,6 +42,7 @@ unsigned equeue_tick() {
 #else
 
 #if MBED_CONF_EVENTS_USE_LOWPOWER_TIMER_TICKER
+
 #define ALIAS_TIMER      LowPowerTimer
 #define ALIAS_TICKER     LowPowerTicker
 #define ALIAS_TIMEOUT    LowPowerTimeout
diff --git a/events/mbed_shared_queues.cpp b/events/mbed_shared_queues.cpp
index b227d8d850..6504bb0c8d 100644
--- a/events/mbed_shared_queues.cpp
+++ b/events/mbed_shared_queues.cpp
@@ -15,7 +15,11 @@
  */
 
 #include "events/mbed_shared_queues.h"
-#include "mbed.h"
+
+#ifdef MBED_CONF_RTOS_PRESENT
+#include "rtos/Thread.h"
+using rtos::Thread;
+#endif
 
 using namespace events;