Use new include paths.

Also fix a warning where the %d was being used for format a long.

Change-Id: I7cc01394f36320613a9509839bae98e0e4c90070
13 files changed