copyright headers
Tidy up #include directives