Revert "Revert "Revert "Cleanup transitive includes in the legacy inlines."""
This reverts commit f945fb6b8a09d08be89b1b771b20d7291baab659.
Reason for revert: haven't fixed all the builds yet
Change-Id: I55aff5d0290c27691427d91a8e46ae01c87da6b2
diff --git a/libc/include/android/legacy_strings_inlines.h b/libc/include/android/legacy_strings_inlines.h
index 5d63c5a..6679c30 100644
--- a/libc/include/android/legacy_strings_inlines.h
+++ b/libc/include/android/legacy_strings_inlines.h
@@ -29,19 +29,16 @@
#ifndef _ANDROID_LEGACY_STRINGS_INLINES_H_
#define _ANDROID_LEGACY_STRINGS_INLINES_H_
-#include <sys/cdefs.h>
-
-#if defined(__i386__) && __ANDROID_API__ < __ANDROID_API_J_MR2__
-
#include <strings.h>
+#include <sys/cdefs.h>
__BEGIN_DECLS
+#if defined(__i386__) && __ANDROID_API__ < __ANDROID_API_J_MR2__
/* Everyone except x86 had ffs since the beginning. */
static __inline int ffs(int __n) { return __builtin_ffs(__n); }
+#endif
__END_DECLS
#endif
-
-#endif