Remove two old tr1wrap/memory.hh includes.