SQUASHME: more lib -> ringbuffer dep fixes