Removed unneeded includes

Most of these went away with the core logic move to Creativity.[hc]pp.