Removing redundant includes from Buffer class