Add Wext definition possibility and a fix