diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt
index 1e9c76378..db0a6353f 100644
--- a/src/qt/CMakeLists.txt
+++ b/src/qt/CMakeLists.txt
@@ -41,8 +41,12 @@ endif()
 set(CMAKE_FIND_PACKAGE_PREFER_CONFIG OFF)
 
 find_package(Threads REQUIRED)
-find_package(Qt${QT_MAJOR} COMPONENTS Core Widgets Network OpenGL REQUIRED)
+find_package(Qt${QT_MAJOR} COMPONENTS Core Widgets Network OpenGL Gui REQUIRED)
 find_package(Qt${QT_MAJOR}LinguistTools REQUIRED NO_CMAKE_FIND_ROOT_PATH)
+if(NOT USE_QT6)
+    # For <qpa/qplatformwindow.h>  in src/qt/qt_mainwindow.cpp
+    include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
+endif ()
 
 # TODO: Is this the correct way to do this, and is it required on any
 # other platforms or with Qt 5?
diff --git a/src/sound/snd_opl_ymfm.cpp b/src/sound/snd_opl_ymfm.cpp
index 1da97adfa..ccd77ed39 100644
--- a/src/sound/snd_opl_ymfm.cpp
+++ b/src/sound/snd_opl_ymfm.cpp
@@ -425,7 +425,7 @@ const device_t ym3812_ymfm_device = {
     .init          = ymfm_drv_init,
     .close         = ymfm_drv_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -439,7 +439,7 @@ const device_t ymf262_ymfm_device = {
     .init          = ymfm_drv_init,
     .close         = ymfm_drv_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -453,7 +453,7 @@ const device_t ymf289b_ymfm_device = {
     .init          = ymfm_drv_init,
     .close         = ymfm_drv_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL
@@ -467,7 +467,7 @@ const device_t ymf278b_ymfm_device = {
     .init          = ymfm_drv_init,
     .close         = ymfm_drv_close,
     .reset         = NULL,
-    { .available = NULL },
+    .available     = NULL,
     .speed_changed = NULL,
     .force_redraw  = NULL,
     .config        = NULL