Manage_inactivity expand in marlin.h

finally this should work. it works in the stable branch. i can't compile
the dev atm.