Fixed wrong includes for non x86 archs