Mainly...fix up the includes I removed, as well as prototypes Pointed out by D'Arcy
Attach a file by drag & drop or click to upload
