buffer:  Name functions with cmark_ prefix.
Added some includes of buffer.h