Changed generated header files to use new base classes in data class.