Fixed issues with include file path lookup

Signed-off-by: Sateesh Kavuri <sateesh@mobilitas.co>