Update includes and namespaces to compile correctly.