[extensions][offset] Update #includes to include the moved buffer code