Moving includes and references.
More cleanup