cleanup 12

remove redundant #include
change `inp == 0` to `inp < 1`
Merge branch 'export'
Merge branch 'master' into export
cleanup 13