diff --git a/libraries/mbed/api/Stream.h b/libraries/mbed/api/Stream.h
index e92ec8155c..c1ee429ea8 100644
--- a/libraries/mbed/api/Stream.h
+++ b/libraries/mbed/api/Stream.h
@@ -18,6 +18,7 @@
 
 #include "platform.h"
 #include "FileLike.h"
+#include "stdarg.h"
 
 namespace mbed {
 
diff --git a/libraries/mbed/common/Stream.cpp b/libraries/mbed/common/Stream.cpp
index ec5b7cf3c2..3302442a92 100644
--- a/libraries/mbed/common/Stream.cpp
+++ b/libraries/mbed/common/Stream.cpp
@@ -15,8 +15,6 @@
  */
 #include "Stream.h"
 
-#include <cstdarg>
-
 namespace mbed {
 
 Stream::Stream(const char *name) : FileLike(name), _file(NULL) {
@@ -91,7 +89,7 @@ off_t Stream::flen() {
 }
 
 int Stream::printf(const char* format, ...) {
-    std::va_list arg;
+    va_list arg;
     va_start(arg, format);
     fflush(_file);
     int r = vfprintf(_file, format, arg);
@@ -100,7 +98,7 @@ int Stream::printf(const char* format, ...) {
 }
 
 int Stream::scanf(const char* format, ...) {
-    std::va_list arg;
+    va_list arg;
     va_start(arg, format);
     fflush(_file);
     int r = vfscanf(_file, format, arg);