diff --git a/meson.build b/meson.build
index a32910ca92..62671f1e4b 100644
--- a/meson.build
+++ b/meson.build
@@ -837,7 +837,12 @@ if 'CONFIG_OPENGL' in config_host
                               link_args: config_host['OPENGL_LIBS'].split())
 endif
 
-tomlpp = declare_dependency(include_directories: 'tomlplusplus')
+tomllib = static_library('tomlpp', sources: files('toml.cpp'),
+                         include_directories: 'tomlplusplus')
+toml = declare_dependency(compile_args: ['-DTOML_HEADER_ONLY=0'],
+                          include_directories: 'tomlplusplus',
+                          link_with: tomllib)
+
 genconfig = declare_dependency(include_directories: 'genconfig')
 
 xemu_gtk = declare_dependency(compile_args: config_host['XEMU_GTK_CFLAGS'].split(),
@@ -2315,7 +2320,7 @@ specific_ss.add(files('xemu-xbe.c', 'xemu-version.c'))
 
 common_ss.add(files('cpus-common.c'))
 
-common_ss.add(tomlpp)
+common_ss.add(toml)
 common_ss.add(genconfig)
 
 subdir('softmmu')
diff --git a/toml.cpp b/toml.cpp
new file mode 100644
index 0000000000..16a931b5a6
--- /dev/null
+++ b/toml.cpp
@@ -0,0 +1,3 @@
+#define TOML_HEADER_ONLY 0
+#define TOML_IMPLEMENTATION
+#include <toml.hpp>
diff --git a/ui/xemu-hud.cc b/ui/xemu-hud.cc
index 18e93b8def..9dde7535b8 100644
--- a/ui/xemu-hud.cc
+++ b/ui/xemu-hud.cc
@@ -1688,12 +1688,10 @@ protected:
 
 public:
     bool is_open;
-    bool should_prompt_auto_update_selection;
 
     AutoUpdateWindow()
     {
         is_open = false;
-        should_prompt_auto_update_selection = false;
     }
 
     ~AutoUpdateWindow()