Step 6.5: Remove uncalled-for includes
Step 6.6: Clean up includes and forward declarations