Cleanup exports
update for new exports
consistent guards
better header guards