Step 6.5: Remove uncalled-for includes and forward declarations