Fix csc in cross compiled builds
Cleaning up macros