Clean up duplicate #includes