More include dirs code clean up.
Bumped build #.