remove a few MAKEDEFS_C ifdefs