diff --git a/newlib/libc/stdio64/freopen64.c b/newlib/libc/stdio64/freopen64.c
index 8a069d53e..f7df35407 100644
--- a/newlib/libc/stdio64/freopen64.c
+++ b/newlib/libc/stdio64/freopen64.c
@@ -74,6 +74,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 #include <time.h>
 #include <stdio.h>
+#include <string.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
diff --git a/newlib/libc/stdlib/quick_exit.c b/newlib/libc/stdlib/quick_exit.c
index fc435711e..1d6fb231e 100644
--- a/newlib/libc/stdlib/quick_exit.c
+++ b/newlib/libc/stdlib/quick_exit.c
@@ -28,6 +28,7 @@
  */
 
 #include <stdlib.h>
+#include <unistd.h>
 #include <sys/lock.h>
 
 /**
diff --git a/newlib/libc/stdlib/strtold.c b/newlib/libc/stdlib/strtold.c
index 96254eb49..a6d415db6 100644
--- a/newlib/libc/stdlib/strtold.c
+++ b/newlib/libc/stdlib/strtold.c
@@ -30,6 +30,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include <stdlib.h>
 #include "local.h"
+#include "mprec.h"
+#undef FLT_ROUNDS
 
 #ifdef _HAVE_LONG_DOUBLE
 
diff --git a/newlib/libc/string/gnu_basename.c b/newlib/libc/string/gnu_basename.c
index 46b92d0fd..90e22ccdf 100644
--- a/newlib/libc/string/gnu_basename.c
+++ b/newlib/libc/string/gnu_basename.c
@@ -20,7 +20,7 @@ _DEFUN (__gnu_basename, (path),
   char *p;
   if ((p = strrchr (path, '/')))
     return p + 1;
-  return path;
+  return (char *) path;
 }
 
 #endif /* !_NO_BASENAME  */