Moved/replaced some useless includes of Rectangle.h.