Include dirs code clean up.
Bumped build #.