Add missing defuns

This makes this library independent.