Removed references to WIN32 and (temporarily) changed the Common namespace.