From 74832b3eddeb93415504b66166721565c85f515a Mon Sep 17 00:00:00 2001
From: Deepika <deepika.bhavnani@arm.com>
Date: Wed, 5 Sep 2018 11:59:36 -0500
Subject: [PATCH] Framework: Add required header file and namespace element
 instead add all

---
 .../frameworks/greentea-client/source/greentea_metrics.cpp    | 2 --
 .../frameworks/greentea-client/source/greentea_test_env.cpp   | 1 -
 features/frameworks/utest/mbed-utest-shim.cpp                 | 1 -
 features/frameworks/utest/source/utest_shim.cpp               | 4 +++-
 features/frameworks/utest/source/utest_stack_trace.cpp        | 1 -
 features/frameworks/utest/utest/utest_scheduler.h             | 2 +-
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/features/frameworks/greentea-client/source/greentea_metrics.cpp b/features/frameworks/greentea-client/source/greentea_metrics.cpp
index 35cfb271e8..5739174f25 100644
--- a/features/frameworks/greentea-client/source/greentea_metrics.cpp
+++ b/features/frameworks/greentea-client/source/greentea_metrics.cpp
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-#include "mbed.h"
-#include "rtos.h"
 #include "mbed_stats.h"
 #include "cmsis_os2.h"
 #include "greentea-client/test_env.h"
diff --git a/features/frameworks/greentea-client/source/greentea_test_env.cpp b/features/frameworks/greentea-client/source/greentea_test_env.cpp
index 08e43fc917..2a5dda1b8f 100644
--- a/features/frameworks/greentea-client/source/greentea_test_env.cpp
+++ b/features/frameworks/greentea-client/source/greentea_test_env.cpp
@@ -18,7 +18,6 @@
 #include <ctype.h>
 #include <cstdio>
 #include <string.h>
-#include "mbed.h"
 #include "greentea-client/test_env.h"
 #include "greentea-client/greentea_serial.h"
 #include "greentea-client/greentea_metrics.h"
diff --git a/features/frameworks/utest/mbed-utest-shim.cpp b/features/frameworks/utest/mbed-utest-shim.cpp
index b2676ce8dc..38a912e55d 100644
--- a/features/frameworks/utest/mbed-utest-shim.cpp
+++ b/features/frameworks/utest/mbed-utest-shim.cpp
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-#include "mbed.h"
 #include "mbed_critical.h"
 #include "utest/utest.h"
 
diff --git a/features/frameworks/utest/source/utest_shim.cpp b/features/frameworks/utest/source/utest_shim.cpp
index 07a1f82f80..076323e9b1 100644
--- a/features/frameworks/utest/source/utest_shim.cpp
+++ b/features/frameworks/utest/source/utest_shim.cpp
@@ -58,7 +58,9 @@ utest_v1_scheduler_t utest_v1_get_scheduler()
 #ifdef YOTTA_MBED_HAL_VERSION_STRING
 #   include "mbed-hal/us_ticker_api.h"
 #else
-#   include "mbed.h"
+#include "platform/SingletonPtr.h"
+#include "Timeout.h"
+using mbed::Timeout;
 #endif
 
 // only one callback is active at any given time
diff --git a/features/frameworks/utest/source/utest_stack_trace.cpp b/features/frameworks/utest/source/utest_stack_trace.cpp
index 83c206f4b8..5c7858be4b 100644
--- a/features/frameworks/utest/source/utest_stack_trace.cpp
+++ b/features/frameworks/utest/source/utest_stack_trace.cpp
@@ -17,7 +17,6 @@
 #ifdef UTEST_STACK_TRACE
  
 #include "greentea-client/test_env.h"
-#include "mbed.h"
 #include "utest/utest.h"
 #include "unity/unity.h"
 #include "utest/utest_stack_trace.h"
diff --git a/features/frameworks/utest/utest/utest_scheduler.h b/features/frameworks/utest/utest/utest_scheduler.h
index 9f81edf4e2..d92a3143c9 100644
--- a/features/frameworks/utest/utest/utest_scheduler.h
+++ b/features/frameworks/utest/utest/utest_scheduler.h
@@ -22,7 +22,7 @@
 #ifndef UTEST_SCHEDULER_H
 #define UTEST_SCHEDULER_H
 
-#include "mbed.h"
+#include "hal/ticker_api.h"
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdio.h>