Cleaned up includes in the debug controller