Fixing includes and class name.