Cleaned up includes for ProjectDataModel