removed macros from buildsystem