More build fixes.

OVERRIDE -> override
various include paths changes and functions renamed.