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_signal_inlines.h b/libc/include/android/legacy_signal_inlines.h
index 44c2f4f..4d474b0 100644
--- a/libc/include/android/legacy_signal_inlines.h
+++ b/libc/include/android/legacy_signal_inlines.h
@@ -29,16 +29,16 @@
#ifndef _ANDROID_LEGACY_SIGNAL_INLINES_H_
#define _ANDROID_LEGACY_SIGNAL_INLINES_H_
-#include <sys/cdefs.h>
-
-#if __ANDROID_API__ < __ANDROID_API_L__
-
#include <errno.h>
#include <signal.h>
#include <string.h>
+#include <sys/cdefs.h>
+
__BEGIN_DECLS
+#if __ANDROID_API__ < __ANDROID_API_L__
+
sighandler_t bsd_signal(int __signal, sighandler_t __handler) __REMOVED_IN(21);
/* These weren't introduced until L. */
@@ -117,8 +117,8 @@
return bsd_signal(s, f);
}
-__END_DECLS
-
#endif /* __ANDROID_API__ < __ANDROID_API_L__ */
+__END_DECLS
+
#endif /* _ANDROID_LEGACY_SIGNAL_INLINES_H_ */