More work on include paths etc
Define some of these. This is pretty much a hack