From 52c33b54940db44c23f2610c26b69bc9e2a174cc Mon Sep 17 00:00:00 2001
From: deepikabhavnani <deepika.bhavnani@arm.com>
Date: Wed, 2 May 2018 14:15:01 -0500
Subject: [PATCH] Add stats header file to mbed.h

All API header files should be part of mbed.h
---
 mbed.h                             | 1 +
 rtos/TARGET_CORTEX/mbed_rtx_conf.h | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/mbed.h b/mbed.h
index c7e0bcf4e0..ffa82cc50f 100644
--- a/mbed.h
+++ b/mbed.h
@@ -92,6 +92,7 @@
 #include "platform/DirHandle.h"
 #include "platform/CriticalSectionLock.h"
 #include "platform/DeepSleepLock.h"
+#include "platform/mbed_stats.h"
 
 // mbed Non-hardware components
 #include "platform/Callback.h"
diff --git a/rtos/TARGET_CORTEX/mbed_rtx_conf.h b/rtos/TARGET_CORTEX/mbed_rtx_conf.h
index f983012ebd..5d9b49c1b8 100644
--- a/rtos/TARGET_CORTEX/mbed_rtx_conf.h
+++ b/rtos/TARGET_CORTEX/mbed_rtx_conf.h
@@ -45,11 +45,7 @@
 #error "OS Tickrate must be 1000 for system timing"
 #endif
 
-#if !defined(OS_STACK_WATERMARK) && defined(MBED_STACK_STATS_ENABLED)
-#define OS_STACK_WATERMARK          1
-#endif
-
-#if !defined(OS_STACK_WATERMARK) && defined(MBED_ALL_STATS_ENABLED)
+#if !defined(OS_STACK_WATERMARK) && (defined(MBED_STACK_STATS_ENABLED) || defined(MBED_ALL_STATS_ENABLED))
 #define OS_STACK_WATERMARK          1
 #endif