moving headers around in src/meh with trivial cleanups