Correct lint warnings #11
Correct #includes #11
Correct Makefile.am #11