Fix processing of -include and -imacro files using relative paths

Change-Id: I0804d4002140bff5ca6aa850f1d6c3ddc0512353