Don't include bp-check.h and don't use CHECK_1

Related to a2da1673fe32540799c801e8aec374dc1c0e0596
and f3aae3f3eb4e4345413dc238e941cdb52f747d16