fix minor inconsistencies
cleanup and move includes to util
move includes from public header to util