diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
index 19efa60f48..f9b57acaa8 100644
--- a/src/platformsupport/platformsupport.pro
+++ b/src/platformsupport/platformsupport.pro
@@ -22,13 +22,6 @@ include(linuxaccessibility/linuxaccessibility.pri)
 include(clipboard/clipboard.pri)
 include(platformcompositor/platformcompositor.pri)
 
-# dbus convenience for unix except darwin: the platform
-# plugins for these platforms do not use dbus and we
-# don't want to create a false dependency.
-unix:!darwin:qtConfig(dbus) {
-    include(dbusmenu/dbusmenu.pri)
-    include(dbustray/dbustray.pri)
-}
 darwin: include(graphics/graphics.pri)
 
 load(qt_module)
diff --git a/src/platformsupport/dbusmenu/dbusmenu.pri b/src/platformsupport/themes/genericunix/dbusmenu/dbusmenu.pri
similarity index 100%
rename from src/platformsupport/dbusmenu/dbusmenu.pri
rename to src/platformsupport/themes/genericunix/dbusmenu/dbusmenu.pri
diff --git a/src/platformsupport/dbusmenu/qdbusmenuadaptor.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuadaptor.cpp
similarity index 100%
rename from src/platformsupport/dbusmenu/qdbusmenuadaptor.cpp
rename to src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuadaptor.cpp
diff --git a/src/platformsupport/dbusmenu/qdbusmenuadaptor_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuadaptor_p.h
similarity index 100%
rename from src/platformsupport/dbusmenu/qdbusmenuadaptor_p.h
rename to src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuadaptor_p.h
diff --git a/src/platformsupport/dbusmenu/qdbusmenubar.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar.cpp
similarity index 100%
rename from src/platformsupport/dbusmenu/qdbusmenubar.cpp
rename to src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar.cpp
diff --git a/src/platformsupport/dbusmenu/qdbusmenubar_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h
similarity index 100%
rename from src/platformsupport/dbusmenu/qdbusmenubar_p.h
rename to src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h
diff --git a/src/platformsupport/dbusmenu/qdbusmenuconnection.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection.cpp
similarity index 100%
rename from src/platformsupport/dbusmenu/qdbusmenuconnection.cpp
rename to src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection.cpp
diff --git a/src/platformsupport/dbusmenu/qdbusmenuconnection_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection_p.h
similarity index 100%
rename from src/platformsupport/dbusmenu/qdbusmenuconnection_p.h
rename to src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuconnection_p.h
diff --git a/src/platformsupport/dbusmenu/qdbusmenuregistrarproxy.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy.cpp
similarity index 100%
rename from src/platformsupport/dbusmenu/qdbusmenuregistrarproxy.cpp
rename to src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy.cpp
diff --git a/src/platformsupport/dbusmenu/qdbusmenuregistrarproxy_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy_p.h
similarity index 100%
rename from src/platformsupport/dbusmenu/qdbusmenuregistrarproxy_p.h
rename to src/platformsupport/themes/genericunix/dbusmenu/qdbusmenuregistrarproxy_p.h
diff --git a/src/platformsupport/dbusmenu/qdbusmenutypes.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes.cpp
similarity index 100%
rename from src/platformsupport/dbusmenu/qdbusmenutypes.cpp
rename to src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes.cpp
diff --git a/src/platformsupport/dbusmenu/qdbusmenutypes_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes_p.h
similarity index 100%
rename from src/platformsupport/dbusmenu/qdbusmenutypes_p.h
rename to src/platformsupport/themes/genericunix/dbusmenu/qdbusmenutypes_p.h
diff --git a/src/platformsupport/dbusmenu/qdbusplatformmenu.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp
similarity index 100%
rename from src/platformsupport/dbusmenu/qdbusplatformmenu.cpp
rename to src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp
diff --git a/src/platformsupport/dbusmenu/qdbusplatformmenu_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h
similarity index 100%
rename from src/platformsupport/dbusmenu/qdbusplatformmenu_p.h
rename to src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h
diff --git a/src/platformsupport/dbustray/dbustray.pri b/src/platformsupport/themes/genericunix/dbustray/dbustray.pri
similarity index 100%
rename from src/platformsupport/dbustray/dbustray.pri
rename to src/platformsupport/themes/genericunix/dbustray/dbustray.pri
diff --git a/src/platformsupport/dbustray/qdbustrayicon.cpp b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon.cpp
similarity index 99%
rename from src/platformsupport/dbustray/qdbustrayicon.cpp
rename to src/platformsupport/themes/genericunix/dbustray/qdbustrayicon.cpp
index 36939b467e..95e9651e9a 100644
--- a/src/platformsupport/dbustray/qdbustrayicon.cpp
+++ b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon.cpp
@@ -44,7 +44,7 @@
 #include "qdbusmenuconnection_p.h"
 #include "qstatusnotifieritemadaptor_p.h"
 #include "qdbusmenuadaptor_p.h"
-#include "dbusmenu/qdbusplatformmenu_p.h"
+#include "qdbusplatformmenu_p.h"
 #include "qxdgnotificationproxy_p.h"
 
 #include <qpa/qplatformmenu.h>
diff --git a/src/platformsupport/dbustray/qdbustrayicon_p.h b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h
similarity index 100%
rename from src/platformsupport/dbustray/qdbustrayicon_p.h
rename to src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h
diff --git a/src/platformsupport/dbustray/qdbustraytypes.cpp b/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes.cpp
similarity index 100%
rename from src/platformsupport/dbustray/qdbustraytypes.cpp
rename to src/platformsupport/themes/genericunix/dbustray/qdbustraytypes.cpp
diff --git a/src/platformsupport/dbustray/qdbustraytypes_p.h b/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes_p.h
similarity index 100%
rename from src/platformsupport/dbustray/qdbustraytypes_p.h
rename to src/platformsupport/themes/genericunix/dbustray/qdbustraytypes_p.h
diff --git a/src/platformsupport/dbustray/qstatusnotifieritemadaptor.cpp b/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor.cpp
similarity index 100%
rename from src/platformsupport/dbustray/qstatusnotifieritemadaptor.cpp
rename to src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor.cpp
diff --git a/src/platformsupport/dbustray/qstatusnotifieritemadaptor_p.h b/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor_p.h
similarity index 100%
rename from src/platformsupport/dbustray/qstatusnotifieritemadaptor_p.h
rename to src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor_p.h
diff --git a/src/platformsupport/dbustray/qxdgnotificationproxy.cpp b/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy.cpp
similarity index 100%
rename from src/platformsupport/dbustray/qxdgnotificationproxy.cpp
rename to src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy.cpp
diff --git a/src/platformsupport/dbustray/qxdgnotificationproxy_p.h b/src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h
similarity index 100%
rename from src/platformsupport/dbustray/qxdgnotificationproxy_p.h
rename to src/platformsupport/themes/genericunix/dbustray/qxdgnotificationproxy_p.h
diff --git a/src/platformsupport/themes/genericunix/genericunix.pri b/src/platformsupport/themes/genericunix/genericunix.pri
index eed48257d0..27019b4aa2 100644
--- a/src/platformsupport/themes/genericunix/genericunix.pri
+++ b/src/platformsupport/themes/genericunix/genericunix.pri
@@ -1,2 +1,7 @@
 HEADERS += $$PWD/qgenericunixthemes_p.h
 SOURCES += $$PWD/qgenericunixthemes.cpp
+
+qtConfig(dbus) {
+    include(dbusmenu/dbusmenu.pri)
+    include(dbustray/dbustray.pri)
+}