Tidied up includes and namespaces