simplifying includes, there were lots of redundancies that were maybe slowing down compile time?