Tidy up includes for Main.cpp