diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 25e3f210d17..77433681d89 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -573,12 +573,14 @@ qt_internal_extend_target(Gui CONDITION atspi_accessibility
         accessible/linux/dbusxml/DeviceEventController.xml
     DBUS_ADAPTOR_FLAGS
         "-i" "QtGui/private/qspi_struct_marshallers_p.h"
+        "--namespace" "QtGuiPrivate"
     DBUS_INTERFACE_SOURCES
         accessible/linux/dbusxml/Bus.xml
         accessible/linux/dbusxml/Socket.xml
         accessible/linux/dbusxml/org.freedesktop.DBus.Properties.xml
     DBUS_INTERFACE_FLAGS
         "-i" "QtGui/private/qspi_struct_marshallers_p.h"
+        "--namespace" "QtGuiPrivate"
 )
 
 if(atspi_accessibility)
diff --git a/src/gui/accessible/linux/atspiadaptor.cpp b/src/gui/accessible/linux/atspiadaptor.cpp
index 4f863c34cd9..b45321add36 100644
--- a/src/gui/accessible/linux/atspiadaptor.cpp
+++ b/src/gui/accessible/linux/atspiadaptor.cpp
@@ -45,6 +45,7 @@
 QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
+using namespace QtGuiPrivate; // for D-Bus accessibility wrappers
 
 Q_STATIC_LOGGING_CATEGORY(lcAccessibilityAtspi, "qt.accessibility.atspi")
 Q_STATIC_LOGGING_CATEGORY(lcAccessibilityAtspiCreation, "qt.accessibility.atspi.creation")
diff --git a/src/gui/accessible/linux/dbusconnection.cpp b/src/gui/accessible/linux/dbusconnection.cpp
index 7ac0548be6f..bf99a32f9ac 100644
--- a/src/gui/accessible/linux/dbusconnection.cpp
+++ b/src/gui/accessible/linux/dbusconnection.cpp
@@ -17,6 +17,7 @@
 QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
+using namespace QtGuiPrivate; // for D-Bus accessibility wrappers
 
 /* note: do not change these to QStringLiteral;
    we are unloaded before QtDBus is done using the strings.
diff --git a/src/gui/accessible/linux/dbusconnection_p.h b/src/gui/accessible/linux/dbusconnection_p.h
index d40d6d8fd4b..66e9003a339 100644
--- a/src/gui/accessible/linux/dbusconnection_p.h
+++ b/src/gui/accessible/linux/dbusconnection_p.h
@@ -55,8 +55,8 @@ private:
     QString getAccessibilityBusAddress() const;
 
     QDBusServiceWatcher *dbusWatcher;
-    OrgFreedesktopDBusPropertiesInterface *m_dbusProperties;
-    OrgA11yStatusInterface *m_a11yStatus;
+    QtGuiPrivate::OrgFreedesktopDBusPropertiesInterface *m_dbusProperties;
+    QtGuiPrivate::OrgA11yStatusInterface *m_a11yStatus;
     QDBusConnection m_a11yConnection;
     bool m_enabled;
 };
diff --git a/src/gui/accessible/linux/qspiaccessiblebridge.cpp b/src/gui/accessible/linux/qspiaccessiblebridge.cpp
index 1eab8846653..1ee1a435ca5 100644
--- a/src/gui/accessible/linux/qspiaccessiblebridge.cpp
+++ b/src/gui/accessible/linux/qspiaccessiblebridge.cpp
@@ -22,6 +22,7 @@
 QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
+using namespace QtGuiPrivate; // for D-Bus accessibility wrappers
 
 /*!
     \class QSpiAccessibleBridge
diff --git a/src/gui/accessible/linux/qspiaccessiblebridge_p.h b/src/gui/accessible/linux/qspiaccessiblebridge_p.h
index 69c4feb7bf2..7d49c34ac06 100644
--- a/src/gui/accessible/linux/qspiaccessiblebridge_p.h
+++ b/src/gui/accessible/linux/qspiaccessiblebridge_p.h
@@ -21,7 +21,9 @@
 #include <qpa/qplatformaccessibility.h>
 #include <QtCore/qhash.h>
 
+namespace QtGuiPrivate {
 class DeviceEventControllerAdaptor;
+} // namespace QtGuiPrivate
 
 QT_REQUIRE_CONFIG(accessibility);
 
@@ -58,7 +60,7 @@ private:
     void updateStatus();
 
     QSpiDBusCache *cache;
-    DeviceEventControllerAdaptor *dec;
+    QtGuiPrivate::DeviceEventControllerAdaptor *dec;
     AtSpiAdaptor *dbusAdaptor;
     QAtSpiDBusConnection* dbusConnection;
     SpiRoleMapping m_spiRoleMapping;
diff --git a/src/gui/accessible/linux/qspidbuscache.cpp b/src/gui/accessible/linux/qspidbuscache.cpp
index fc5d87c3197..4d7463ad9ff 100644
--- a/src/gui/accessible/linux/qspidbuscache.cpp
+++ b/src/gui/accessible/linux/qspidbuscache.cpp
@@ -13,6 +13,7 @@
 QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
+using namespace QtGuiPrivate; // for D-Bus accessibility wrappers
 
 /*!
     \class QSpiDBusCache