Rearranged includes.
Added dimension/space interface to Widget.