Revert "Revert "Revert "Revert "Revert "Cleanup transitive includes in the legacy inlines."""""
This reverts commit a074ac79d7ac0be5537a8a5bcc1ac15c57d4c22b.
Reason for revert: Broke several builds.
Change-Id: I406f0b0aa0c37961ad031d2f6c5ea4241f3f1111
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