18 files changed, 17 insertions, 15 deletions
diff --git a/lib/index/meson.build b/lib/index/meson.build
index 26da2c3..237adf6 100644
--- a/lib/index/meson.build
+++ b/lib/index/meson.build
@@ -15,22 +15,23 @@
 ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 index_srcs=[
-	'mu-indexer.hh',
-	'mu-indexer.cc',
-	'mu-scanner.hh',
-	'mu-scanner.cc'
+        'mu-indexer.hh',
+        'mu-indexer.cc',
+        'mu-scanner.hh',
+        'mu-scanner.cc'
 ]
 
 xapian_incs = xapian_dep.get_variable(pkgconfig: 'includedir')
 lib_mu_index_inc_dep = declare_dependency(
   include_directories: include_directories(['.', '..', xapian_incs]))
 lib_mu_index=static_library('mu-index', [index_srcs],
-			    dependencies: [
-			      config_h_dep,
-			      glib_dep,
-			      lib_mu_index_inc_dep
-			    ],
-			    install: false)
+                            dependencies: [
+                              config_h_dep,
+                              glib_dep,
+                              lib_mu_utils_dep,
+                              lib_mu_index_inc_dep
+                            ],
+                            install: false)
 
 lib_mu_index_dep = declare_dependency(
   link_with: lib_mu_index
diff --git a/lib/message/meson.build b/lib/message/meson.build
index cab52ee..b1bc21b 100644
--- a/lib/message/meson.build
+++ b/lib/message/meson.build
@@ -38,7 +38,7 @@ lib_mu_message=static_library(
 
 lib_mu_message_dep = declare_dependency(
   link_with: lib_mu_message,
-  dependencies: [ xapian_dep, gmime_dep ],
+  dependencies: [ xapian_dep, gmime_dep, lib_mu_utils_dep ],
   include_directories:
     include_directories(['.', '..']))
 
diff --git a/lib/thirdparty/fmt/fmt/args.h b/lib/thirdparty/fmt/args.h
index a3966d1..a3966d1 100644
--- a/lib/thirdparty/fmt/fmt/args.h
+++ b/lib/thirdparty/fmt/args.h
diff --git a/lib/thirdparty/fmt/fmt/chrono.h b/lib/thirdparty/fmt/chrono.h
index 55e8a50..55e8a50 100644
--- a/lib/thirdparty/fmt/fmt/chrono.h
+++ b/lib/thirdparty/fmt/chrono.h
diff --git a/lib/thirdparty/fmt/fmt/color.h b/lib/thirdparty/fmt/color.h
index d175448..d175448 100644
--- a/lib/thirdparty/fmt/fmt/color.h
+++ b/lib/thirdparty/fmt/color.h
diff --git a/lib/thirdparty/fmt/fmt/compile.h b/lib/thirdparty/fmt/compile.h
index 94e13c0..94e13c0 100644
--- a/lib/thirdparty/fmt/fmt/compile.h
+++ b/lib/thirdparty/fmt/compile.h
diff --git a/lib/thirdparty/fmt/fmt/core.h b/lib/thirdparty/fmt/core.h
index 46723d5..46723d5 100644
--- a/lib/thirdparty/fmt/fmt/core.h
+++ b/lib/thirdparty/fmt/core.h
diff --git a/lib/thirdparty/fmt/fmt/format-inl.h b/lib/thirdparty/fmt/format-inl.h
index 5bae3c7..5bae3c7 100644
--- a/lib/thirdparty/fmt/fmt/format-inl.h
+++ b/lib/thirdparty/fmt/format-inl.h
diff --git a/lib/thirdparty/fmt/fmt/format.h b/lib/thirdparty/fmt/format.h
index ed8b29e..ed8b29e 100644
--- a/lib/thirdparty/fmt/fmt/format.h
+++ b/lib/thirdparty/fmt/format.h
diff --git a/lib/thirdparty/fmt/fmt/os.h b/lib/thirdparty/fmt/os.h
index ec29040..ec29040 100644
--- a/lib/thirdparty/fmt/fmt/os.h
+++ b/lib/thirdparty/fmt/os.h
diff --git a/lib/thirdparty/fmt/fmt/ostream.h b/lib/thirdparty/fmt/ostream.h
index ce65909..ce65909 100644
--- a/lib/thirdparty/fmt/fmt/ostream.h
+++ b/lib/thirdparty/fmt/ostream.h
diff --git a/lib/thirdparty/fmt/fmt/printf.h b/lib/thirdparty/fmt/printf.h
index 554715e..554715e 100644
--- a/lib/thirdparty/fmt/fmt/printf.h
+++ b/lib/thirdparty/fmt/printf.h
diff --git a/lib/thirdparty/fmt/fmt/ranges.h b/lib/thirdparty/fmt/ranges.h
index 266b9e1..266b9e1 100644
--- a/lib/thirdparty/fmt/fmt/ranges.h
+++ b/lib/thirdparty/fmt/ranges.h
diff --git a/lib/thirdparty/fmt/fmt/std.h b/lib/thirdparty/fmt/std.h
index 4c2a28c..4c2a28c 100644
--- a/lib/thirdparty/fmt/fmt/std.h
+++ b/lib/thirdparty/fmt/std.h
diff --git a/lib/thirdparty/fmt/fmt/xchar.h b/lib/thirdparty/fmt/xchar.h
index 4b87f8d..4b87f8d 100644
--- a/lib/thirdparty/fmt/fmt/xchar.h
+++ b/lib/thirdparty/fmt/xchar.h
diff --git a/lib/utils/meson.build b/lib/utils/meson.build
index 453ddc1..fd5b72f 100644
--- a/lib/utils/meson.build
+++ b/lib/utils/meson.build
@@ -33,14 +33,14 @@ lib_mu_utils=static_library('mu-utils', [
   readline_dep,
   cld2_dep
 ], include_directories:
-     include_directories(['.','..']),
+     include_directories(['.','..', '../thirdparty/']),
 install: false)
 
 lib_mu_utils_dep = declare_dependency(
   link_with: lib_mu_utils,
   compile_args: '-DFMT_HEADER_ONLY',
   include_directories:
-    include_directories(['.', '..', '../thirdparty/fmt'])
+    include_directories(['.', '..', '../thirdparty'])
 )
 
 #
@@ -80,5 +80,6 @@ test('test-lang-detector',
      executable('test-lang-detector', 'mu-lang-detector.cc',
                 install: false,
                 cpp_args: ['-DBUILD_TESTS'],
+                dependencies: [ config_h_dep, glib_dep, lib_mu_utils_dep ]))
 
 subdir('tests')
diff --git a/lib/utils/mu-option.hh b/lib/utils/mu-option.hh
index c288548..3ca683e 100644
--- a/lib/utils/mu-option.hh
+++ b/lib/utils/mu-option.hh
@@ -20,7 +20,7 @@
 #ifndef MU_OPTION__
 #define MU_OPTION__
 
-#include "thirdparty/optional.hpp"
+#include <tl/optional.hpp>
 #include <string>
 
 namespace Mu {
diff --git a/lib/utils/mu-result.hh b/lib/utils/mu-result.hh
index 557102c..02ca332 100644
--- a/lib/utils/mu-result.hh
+++ b/lib/utils/mu-result.hh
@@ -20,7 +20,7 @@
 #ifndef MU_RESULT_HH__
 #define MU_RESULT_HH__
 
-#include "thirdparty/expected.hpp"
+#include <tl/expected.hpp>
 #include "utils/mu-error.hh"
 
 namespace Mu {