fixing some include errors, and fixing warnings

this compiles :+1: