Corrected library names and paths to macros