Remove unnecessary include and add bind() to unmap() in Buffer