JOHNE - Rename the gdk 'windows' utils library (will avoid confusion when we move to 64-bit)
JOHNE - Second part of the previous check-in
JOHNE - Some minor labelling changes