diff --unified --recursive --text bitwuzla-0.4.0.orig/src/meson.build bitwuzla-0.4.0/src/meson.build
--- bitwuzla-0.4.0.orig/src/meson.build	2024-03-06 17:54:03.000000000 +0000
+++ bitwuzla-0.4.0/src/meson.build	2024-03-24 17:48:19.062284270 +0000
@@ -17,24 +17,25 @@
 # CaDiCaL does not provide pkg-config to find dependency
 cadical_dep = cpp_compiler.find_library('cadical',
                                         has_headers: 'cadical.hpp',
-                                        static: build_static,
+                                        static: true,
                                         required: false)
 if not cadical_dep.found()
   cadical_dep = dependency('cadical', required: true)
 endif

+kissat_inc = include_directories('/usr/include/kissat')
+
 # Kissat does not provide pkg-config to find dependency
 kissat_dep = cpp_compiler.find_library('kissat',
-                                        has_headers: 'kissat.h',
-                                        static: build_static,
-                                        required: false)
+                                       header_include_directories: [kissat_inc],
+                                       has_headers: 'kissat.h',
+                                        required: true)
 if not kissat_dep.found()
   kissat_dep = dependency('kissat', required: get_option('kissat'))
 endif

-# Using system include type suppresses compile warnings originating from the
-# symfpu headers
-symfpu_dep = dependency('symfpu', include_type: 'system', required: true)
+symfpu_inc = include_directories('/usr/include/symfpu')
+symfpu_dep = declare_dependency(include_directories: symfpu_inc)

 dependencies = [symfpu_dep, cadical_dep, kissat_dep, gmp_dep]

@@ -210,7 +211,7 @@
 ])

 # Public header include directory
-bitwuzla_inc = include_directories('../include', 'lib')
+bitwuzla_inc = include_directories('../include', 'lib', '/usr/include/kissat')

 bitwuzla_lib = library('bitwuzla',
                       sources,