mach: get rid of the defines