Fix include paths

Follow up to I4e333cb95023c43556985d8150c7bea0911a2622 to fix a few
include paths that were not updated correctly.

Change-Id: I19d9480b139f15479a1089ec0ccf16dc0252d354