remove #undefs in zap.c