Retain stderr.h and bmerr.h in OS package