Uaapi.h now includes Singleton.h.