diff --git a/meson.build b/meson.build
index e66c3c3..cac384b 100644
--- a/meson.build
+++ b/meson.build
@@ -3,48 +3,40 @@
   'cpp',
   version: '1.0',
   default_options: [
-    'buildtype=debugoptimized',
     'cpp_std=c++23',
     'warning_level=3',
     'werror=true',
   ],
-  meson_version: '>=1.1.1',
-)
+  meson_version: '>=1.1.1')
 
-conf_data = configuration_data()
-conf_data.set('ENABLE_GOOGLE', get_option('google_oen').allowed().to_int())
-configure_file(
-  output: 'config.h',
-  configuration: conf_data,
-)
+ethstats_pre = declare_dependency(
+  include_directories: include_directories('.'),
+  dependencies: dependency('libipmid'))
 
-ipmid_dep = dependency('libipmid')
-
-ethstatscmd_common_lib = static_library(
+ethstats_lib = static_library(
   'ethstatscmd_common',
   'ethstats.cpp',
   'handler.cpp',
-  dependencies: [
-    ipmid_dep,
-  ],
-)
+  implicit_include_directories: false,
+  dependencies: ethstats_pre)
 
-ethstatscmd_common_dep = declare_dependency(
-  link_with: ethstatscmd_common_lib,
-)
+ethstats_dep = declare_dependency(
+  dependencies: ethstats_pre,
+  link_with: ethstats_lib)
 
-ethstatscmd_lib = library(
+conf_data = configuration_data()
+conf_data.set10('ENABLE_GOOGLE', get_option('google_oen'))
+
+shared_library(
   'ethstatscmd',
+  configure_file(output: 'config.h', configuration: conf_data),
   'main.cpp',
-  dependencies: [
-    ethstatscmd_common_dep,
-    ipmid_dep,
-  ],
-  override_options: [ 'b_lundef=false' ],
+  implicit_include_directories: false,
+  dependencies: ethstats_dep,
+  override_options: 'b_lundef=false',
   version: meson.project_version(),
   install: true,
-  install_dir: get_option('libdir') / 'ipmid-providers',
-)
+  install_dir: get_option('libdir') / 'ipmid-providers')
 
 if get_option('tests').allowed()
   subdir('test')