Cleanup types.h