Move import; fix incorrect macro usage