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_sys_wait_inlines.h b/libc/include/android/legacy_sys_wait_inlines.h
index 4298d76..1124f8e 100644
--- a/libc/include/android/legacy_sys_wait_inlines.h
+++ b/libc/include/android/legacy_sys_wait_inlines.h
@@ -30,13 +30,12 @@
#define _ANDROID_LEGACY_SYS_WAIT_INLINES_H_
#include <sys/cdefs.h>
-
-#if __ANDROID_API__ < __ANDROID_API_J_MR2__
-
#include <sys/syscall.h>
#include <sys/wait.h>
#include <unistd.h>
+#if __ANDROID_API__ < __ANDROID_API_J_MR2__
+
__BEGIN_DECLS
static __inline pid_t wait4(pid_t pid, int* status, int options, struct rusage* rusage) {