Since it was not done consistently, it would not get imported dynamically anyway. This fixes the compile warnings.