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_mman_inlines.h b/libc/include/android/legacy_sys_mman_inlines.h
index 160e6fe..7eb537e 100644
--- a/libc/include/android/legacy_sys_mman_inlines.h
+++ b/libc/include/android/legacy_sys_mman_inlines.h
@@ -29,13 +29,12 @@
 #pragma once
 
 #include <sys/cdefs.h>
+#include <sys/mman.h>
+#include <sys/syscall.h>
+#include <unistd.h>
 
 #if __ANDROID_API__ < __ANDROID_API_L__
 
-#include <errno.h>
-#include <sys/mman.h>
-#include <unistd.h>
-
 __BEGIN_DECLS
 
 /*