Removing unnecessary includes in class_def.cpp