Change includes and namespaces (WIP)