Merge "libc: Fix headers to allow direct inclusion."