Finish make integration
Mostly just include file fixes, a few other warning corrections as well