Misc indy and spa updates

General cleanup of unneeded includes, as well as pulling out entangled code.