Fixed issues related to include files lookup

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