All types have been moved into types.h