Less Rectangle, more Point.
Changed includes of Rectangle to reduce compile-time dependancy.