diff --git a/oslo/messaging/_drivers/amqp.py b/oslo/messaging/_drivers/amqp.py
index 1afd2abd0..e7a6b9b7d 100644
--- a/oslo/messaging/_drivers/amqp.py
+++ b/oslo/messaging/_drivers/amqp.py
@@ -36,11 +36,11 @@ from eventlet import queue
 from eventlet import semaphore
 from oslo.config import cfg
 
-from openstack.common import excutils
-from openstack.common.gettextutils import _  # noqa
-from openstack.common import local
-from openstack.common import log as logging
-from openstack.common.rpc import common as rpc_common
+from oslo.messaging._drivers import common as rpc_common
+from oslo.messaging.openstack.common import excutils
+from oslo.messaging.openstack.common.gettextutils import _  # noqa
+from oslo.messaging.openstack.common import local
+from oslo.messaging.openstack.common import log as logging
 
 
 amqp_opts = [
diff --git a/oslo/messaging/_drivers/common.py b/oslo/messaging/_drivers/common.py
index 45bd7a83c..abc6fe7aa 100644
--- a/oslo/messaging/_drivers/common.py
+++ b/oslo/messaging/_drivers/common.py
@@ -24,11 +24,11 @@ import traceback
 from oslo.config import cfg
 import six
 
-from openstack.common.gettextutils import _  # noqa
-from openstack.common import importutils
-from openstack.common import jsonutils
-from openstack.common import local
-from openstack.common import log as logging
+from oslo.messaging.openstack.common.gettextutils import _  # noqa
+from oslo.messaging.openstack.common import importutils
+from oslo.messaging.openstack.common import jsonutils
+from oslo.messaging.openstack.common import local
+from oslo.messaging.openstack.common import log as logging
 
 
 CONF = cfg.CONF
diff --git a/oslo/messaging/_drivers/impl_qpid.py b/oslo/messaging/_drivers/impl_qpid.py
index 99c461943..f58e00516 100644
--- a/oslo/messaging/_drivers/impl_qpid.py
+++ b/oslo/messaging/_drivers/impl_qpid.py
@@ -24,13 +24,13 @@ import eventlet
 import greenlet
 from oslo.config import cfg
 
-from openstack.common import excutils
-from openstack.common.gettextutils import _  # noqa
-from openstack.common import importutils
-from openstack.common import jsonutils
-from openstack.common import log as logging
-from openstack.common.rpc import amqp as rpc_amqp
-from openstack.common.rpc import common as rpc_common
+from oslo.messaging._drivers.rpc import amqp as rpc_amqp
+from oslo.messaging._drivers.rpc import common as rpc_common
+from oslo.messaging.openstack.common import excutils
+from oslo.messaging.openstack.common.gettextutils import _  # noqa
+from oslo.messaging.openstack.common import importutils
+from oslo.messaging.openstack.common import jsonutils
+from oslo.messaging.openstack.common import log as logging
 
 qpid_codec = importutils.try_import("qpid.codec010")
 qpid_messaging = importutils.try_import("qpid.messaging")
diff --git a/oslo/messaging/_drivers/impl_rabbit.py b/oslo/messaging/_drivers/impl_rabbit.py
index 6b1ae9388..62dc50404 100644
--- a/oslo/messaging/_drivers/impl_rabbit.py
+++ b/oslo/messaging/_drivers/impl_rabbit.py
@@ -29,12 +29,12 @@ import kombu.entity
 import kombu.messaging
 from oslo.config import cfg
 
-from openstack.common import excutils
-from openstack.common.gettextutils import _  # noqa
-from openstack.common import network_utils
-from openstack.common.rpc import amqp as rpc_amqp
-from openstack.common.rpc import common as rpc_common
-from openstack.common import sslutils
+from oslo.messaging._drivers import amqp as rpc_amqp
+from oslo.messaging._drivers import common as rpc_common
+from oslo.messaging.openstack.common import excutils
+from oslo.messaging.openstack.common.gettextutils import _  # noqa
+from oslo.messaging.openstack.common import network_utils
+from oslo.messaging.openstack.common import sslutils
 
 kombu_opts = [
     cfg.StrOpt('kombu_ssl_version',