Update include paths

Change-Id: I463eb0a6693ec5da41118f132d8dcdb0d11e4be8