[IMP-dev] Pulling out the macros

It appears that we don't need to have separate copies of the macros in the IMP_macros.i. I have pulled the macros out into separate headers which are then %included into that file.