Fix building with relative paths

Change-Id: I2c1072df1ff45262b557b1d34d835c6289bddf62
Fix building by deleting mutiple defines

Change-Id: I5a51b992d9afb62ff4ec92e5286c3258961dc555
Fix compiler warning

Change-Id: I7ff7dca83028a3c674ce4fafb83a5cd8f7666d43
fix compile for defy