Renamed bon_private.h to private.h