Clean up headers and using declarations.