LPS-32400 - Add Object Declarations and Imports to macro conversions