Cleaning up includes and adding fully-qualified names