s3:lib: use includes.h with cbuf and srprs