Tweak common.h so it builds with nmake