Full review (do not merge)

Use macros instead of absolute paths.