- Split bearch.h correctly into bearch.h and bearch_t.h