BRS: Hopefully fixed the includes for the final time now. I've cleaned and rebuilt several times and it seems to be reliable now