Correct lint warnings #11
Correct a include guard #11
Correct a compilation error #11
Merge branch 'encoding'