Fix include syntax
Minor
Minor
Indent
Indent
Minor
Fixup previous commits