Done with: sed -in 's/\(ifndef\|define\) _\([0-9A-Z_]*\)$/\1 I3_\2/' include/**/*.h fixes #804
Also, finally add include/cmdparse.h