Uaapi.h now includes Policies.h and Singleton.h.