Fixing includes to include classes, not nodes