This reduces the scope of the definitions which are no longer needed to create the common lists.
Also shuffle headers to place widget includes near end. This leaves the widgets directory solely for defining Widget IDs.