include CommonTypes.h instead of Common.h, remove unused using.