Cleanup includes, added framedumper