fixed C macro identifiers halting build
migrated import identifiers to seperate 'import' scope within module