Improved includes, removed stafx.h created c_types.h