Change mem.h and types.h headers to sane user-defined header names