Remove duplicated panda_mark headers, move to a unified location that tests can include.
Fix popping order in panda_mark.