Review Request 1736: Clean up imports in common