[cosmetics] update copyright headers
Merge pull request #3002 from MartijnKaijser/update_header

update copyright headers
Remove unnecessary scope declared inside its own namespace
temp work-in-progress