Update: remove Window friend decl. in Surface