Issue #9: More cleanup from lint
Issue #9: Add missing xml header to some files