Add missing header; main retval missing
Merge branch 'trace-fixup'