flags cleanup: separate definitions from CPP flags
target-echo cleanup