remove header dependencies for two buffer classes