FIX: Fixed inclusion of dependent class files