Fix .macro syntax error + .itf.hpp loading

Fix .macro syntax error + .itf.hpp loading