[cpp] keep IntMap.h if we keep the constructor (closes #3373)