Reland "Cleanup transitive includes in the legacy inlines."
This reverts commit 54c71521b5295f82aaac7aa2f3ce918298fed70f.
Bug: None
Test: make checkbuild
Change-Id: Ica6a4f7ecadfcc854160a60a5db1b44ae3b6c821
diff --git a/libc/include/android/legacy_stdlib_inlines.h b/libc/include/android/legacy_stdlib_inlines.h
index a1cc590..4896d2e 100644
--- a/libc/include/android/legacy_stdlib_inlines.h
+++ b/libc/include/android/legacy_stdlib_inlines.h
@@ -29,9 +29,6 @@
#ifndef _ANDROID_LEGACY_STDLIB_INLINES_H_
#define _ANDROID_LEGACY_STDLIB_INLINES_H_
-#include <errno.h>
-#include <float.h>
-#include <stdlib.h>
#include <sys/cdefs.h>
#if __ANDROID_API__ < __ANDROID_API_K__
@@ -52,6 +49,10 @@
#if __ANDROID_API__ < __ANDROID_API_L__
+#include <errno.h>
+#include <float.h>
+#include <stdlib.h>
+
__BEGIN_DECLS
static __inline float strtof(const char* nptr, char** endptr) {