cleanup dip code, use IMH_.. dip global macros