#504 attempt to use leaner meaner includes to try reduce individual file compile time and fix up some red squigglies in IDEA 13