Changed include/lib paths to use macros