Remove duplicate definitions from buffer.h