fixing broken class inclusions