meson: Cleanup and fix includes

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/hooks/meson.build b/hooks/meson.build
index 15cd0f8cf5918f890e3ac827310f5ad573786255..d72e9b8ce164f1336cd4a260be3b83102e214e06 100644 (file)
--- a/hooks/meson.build
+++ b/hooks/meson.build
@@ -1,15 +1,11 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-hooks_include_directories = include_directories(
-    '../',
-    '../src/include')
-
 hooks_unmount_namespace_sources = files('unmount-namespace.c')
 
 hook_programs += executable(
     'unmount-namespace',
     hooks_unmount_namespace_sources,
-    include_directories: hooks_include_directories,
+    include_directories: liblxc_includes,
     install: true,
     install_dir: join_paths(lxclibexec, 'hooks'))
 

diff --git a/meson.build b/meson.build
index c7c11f66682e1e4a1aa29a9039135d6286e455ae..32bd460305165fe39ee34882cf08d939bd914c3e 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -597,15 +597,13 @@ template_scripts = []
 test_programs = []
 
 # Includes.
-basic_includes = include_directories(
+liblxc_includes = include_directories(
     '.',
     'src',
-    'src/include')
-
-liblxc_includes = [basic_includes, include_directories(
+    'src/include',
+    'src/lxc',
     'src/lxc/cgroups',
-    'src/lxc/lsm',
-    'src/lxc/storage')]
+    'src/lxc/storage')
 
 # Early sub-directories.
 subdir('src/include')

diff --git a/src/lxc/cmd/meson.build b/src/lxc/cmd/meson.build
index 82ceab7c1b515da6e6bdf2fc88b3afd1e0e9851d..8bbda8395b2d29019b88835e76c270f05edf07cd 100644 (file)
--- a/src/lxc/cmd/meson.build
+++ b/src/lxc/cmd/meson.build
@@ -1,14 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-cmd_liblxc_includes = include_directories(
-    '.',
-    '../',
-    '../cgroups',
-    '../lsm',
-    '../storage',
-    '../../include',
-    '../../../')
-
 cmd_common_sources = files(
     '../af_unix.c',
     '../af_unix.h',
@@ -168,7 +159,7 @@ install_data(join_paths(project_build_root, 'src/lxc/cmd/lxc-update-config'), in
 cmd_programs += executable(
     'init.lxc.static',
     cmd_lxc_init_sources,
-    include_directories: cmd_liblxc_includes,
+    include_directories: liblxc_includes,
     link_with: [liblxc_static],
     link_args: ['-static'],
     c_args: ['-DNO_LXC_CONF'],
@@ -179,7 +170,7 @@ cmd_programs += executable(
 cmd_programs += executable(
     'init.lxc',
     cmd_lxc_init_sources,
-    include_directories: cmd_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install_dir: sbindir,
     install: true)
@@ -187,7 +178,7 @@ cmd_programs += executable(
 cmd_programs += executable(
     'lxc-monitord',
     cmd_lxc_monitord_sources,
-    include_directories: cmd_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: true,
     install_dir: lxclibexec)
@@ -195,7 +186,7 @@ cmd_programs += executable(
 cmd_programs += executable(
     'lxc-user-nic',
     cmd_lxc_user_nic_sources,
-    include_directories: cmd_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: true,
     install_dir: lxclibexec)
@@ -203,6 +194,6 @@ cmd_programs += executable(
 cmd_programs += executable(
     'lxc-usernsexec',
     cmd_lxc_usernsexec_sources,
-    include_directories: cmd_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: true)

diff --git a/src/lxc/pam/meson.build b/src/lxc/pam/meson.build
index 77f6154dd5b962936d28b52b028807c561ef1357..3078fb1c4279d52351033a06aa7717d634266808 100644 (file)
--- a/src/lxc/pam/meson.build
+++ b/src/lxc/pam/meson.build
@@ -1,12 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-pam_cgfs_includes = include_directories(
-    '.',
-    '../',
-    '../cgroups',
-    '../../include',
-    '../../../')
-
 pam_cgfs_sources = files(
     'pam_cgfs.c',
     '../file_utils.c',
@@ -19,7 +12,7 @@ pam_cgfs_sources = files(
 if want_pam_cgroup
     pam_cgfs = shared_module(
         'pam_cgfs',
-        include_directories: pam_cgfs_includes,
+        include_directories: liblxc_includes,
         sources: pam_cgfs_sources,
         dependencies: [pkgconfig_libs],
         name_prefix: '',

diff --git a/src/lxc/tools/meson.build b/src/lxc/tools/meson.build
index 12deb24b1e184156e913ecae0a6c830c34ebbd07..ab78153c3093723baaea14ffcf11b0bc131a061d 100644 (file)
--- a/src/lxc/tools/meson.build
+++ b/src/lxc/tools/meson.build
@@ -1,14 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-tools_liblxc_includes = include_directories(
-    '.',
-    '../',
-    '../cgroups',
-    '../lsm',
-    '../storage',
-    '../../include',
-    '../../../')
-
 tools_common_sources = files(
     'arguments.c',
     'arguments.h',
@@ -179,154 +170,154 @@ if want_tools
     public_programs += executable(
         'lxc-attach',
         tools_lxc_attach_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-autostart',
         tools_lxc_autostart_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
        'lxc-cgroup',
         tools_lxc_cgroup_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
        'lxc-checkpoint',
         tools_lxc_checkpoint_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-config',
         tools_lxc_config_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-console',
         tools_lxc_console_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-copy',
         tools_lxc_copy_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-create',
         tools_lxc_create_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-destroy',
         tools_lxc_destroy_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-device',
         tools_lxc_device_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-execute',
         tools_lxc_execute_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-freeze',
         tools_lxc_freeze_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-info',
         tools_lxc_info_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-ls',
         tools_lxc_ls_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-monitor',
         tools_lxc_monitor_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-snapshot',
         tools_lxc_snapshot_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-start',
         tools_lxc_start_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-stop',
         tools_lxc_stop_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-top',
         tools_lxc_top_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-unfreeze',
         tools_lxc_unfreeze_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-unshare',
         tools_lxc_unshare_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 
     public_programs += executable(
         'lxc-wait',
         tools_lxc_wait_sources,
-        include_directories: tools_liblxc_includes,
+        include_directories: liblxc_includes,
         dependencies: liblxc_dep,
         install: true)
 endif

diff --git a/src/tests/meson.build b/src/tests/meson.build
index 3154bb9c854a28cdaff548043ab07862a1f2cfce..a553ec4f5711a0d02a169bafc03910cb3128e08f 100644 (file)
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -1,14 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-tests_liblxc_includes = include_directories(
-    '.',
-    '../lxc/',
-    '../lxc/cgroups',
-    '../lxc/lsm',
-    '../lxc/storage',
-    '../include',
-    '../../')
-
 tests_common_sources = files(
     '../lxc/af_unix.c',
     '../lxc/af_unix.h',
@@ -110,7 +101,7 @@ tests_common_sources = files(
 test_programs += executable(
     'lxc-test-arch-parse',
     files('arch_parse.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -118,7 +109,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-apparmor',
     files('aa.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -126,7 +117,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-api-reboot',
     files('api_reboot.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -134,7 +125,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-attach',
     files('attach.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -142,7 +133,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-basic',
     files('basic.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -150,7 +141,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-capabilities',
     files('capabilities.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -158,7 +149,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-cgpath',
     files('cgpath.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -166,7 +157,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-clonetest',
     files('clonetest.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -174,7 +165,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-concurrent',
     files('concurrent.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -182,7 +173,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-config-jump-table',
     files('config_jump_table.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -190,7 +181,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-console',
     files('console.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -198,7 +189,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-console-log',
     files('console_log.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -206,7 +197,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-containertests',
     files('containertests.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -214,7 +205,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-createtest',
     files('createtest.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -222,7 +213,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-criu-check-feature',
     files('criu_check_feature.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -230,7 +221,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-cve-2019-5736',
     files('cve-2019-5736.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -238,7 +229,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-destroytest',
     files('destroytest.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -246,7 +237,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-device-add-remove',
     files('device_add_remove.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -254,7 +245,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-get_item',
     files('get_item.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -262,7 +253,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-getkeys',
     files('getkeys.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -270,7 +261,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-list',
     files('list.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -278,7 +269,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-locktests',
     files('locktests.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -286,7 +277,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-utils',
     files('lxc-test-utils.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -294,7 +285,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-raw-clone',
     files('lxc_raw_clone.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -302,7 +293,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-lxcpath',
     files('lxcpath.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -310,7 +301,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-may-control',
     files('may_control.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -318,7 +309,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-mount-injection',
     files('mount_injection.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -326,7 +317,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-parse-config-file',
     files('parse_config_file.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -334,7 +325,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-proc-pid',
     files('proc_pid.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -342,7 +333,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-reboot',
     files('reboot.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -350,7 +341,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-rootfs-options',
     files('rootfs_options.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -358,7 +349,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-saveconfig',
     files('saveconfig.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -366,7 +357,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-share-ns',
     files('share_ns.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -374,7 +365,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-shortlived',
     files('shortlived.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -382,7 +373,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-shutdowntest',
     files('shutdowntest.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -390,7 +381,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-snapshot',
     files('snapshot.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -398,7 +389,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-startone',
     files('startone.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -406,7 +397,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-state-server',
     files('state_server.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -414,7 +405,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-sys-mixed',
     files('sys_mixed.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)
@@ -422,7 +413,7 @@ test_programs += executable(
 test_programs += executable(
     'lxc-test-sysctls',
     files('sysctls.c') + tests_common_sources,
-    include_directories: tests_liblxc_includes,
+    include_directories: liblxc_includes,
     dependencies: liblxc_dep,
     install: want_tests,
     build_by_default: want_tests != false)