Moved headers outside of include