kayos: Clean up includes, fix some headers.