Google Git
Sign in
pigweed/third_party/github/zephyrproject-rtos/zephyr/bbe5e1e6ebf4a1a66c023d834fbdfca22a98ee7d^!/./kernel
commit
bbe5e1e6ebf4a1a66c023d834fbdfca22a98ee7d
[log]
author
Yong Cong Sin <ycsin@meta.com>
Wed Jan 24 17:35:04 2024 +0800
committer
Henrik Brix Andersen <henrik@brixandersen.dk>
Tue May 28 22:03:55 2024 +0200
tree
98e14c970330653b50142d186979912f85e9ea4d
parent
d034106b4035f26002c938f33ed59f6802ff235b [diff]
build: namespace the generated headers with `zephyr/`

Namespaced the generated headers with `zephyr` to prevent
potential conflict with other headers.

Introduce a temporary Kconfig `LEGACY_GENERATED_INCLUDE_PATH`
that is enabled by default. This allows the developers to
continue the use of the old include paths for the time being
until it is deprecated and eventually removed. The Kconfig will
generate a build-time warning message, similar to the
`CONFIG_TIMER_RANDOM_GENERATOR`.

Updated the includes path of in-tree sources accordingly.

Most of the changes here are scripted, check the PR for more
info.

Signed-off-by: Yong Cong Sin <ycsin@meta.com>

diff --git a/kernel/atomic_c.c b/kernel/atomic_c.c
index c873192..70fff83 100644
--- a/kernel/atomic_c.c
+++ b/kernel/atomic_c.c

@@ -112,7 +112,7 @@
 
 	return z_impl_atomic_cas((atomic_t *)target, old_value, new_value);
 }
-#include <syscalls/atomic_cas_mrsh.c>
+#include <zephyr/syscalls/atomic_cas_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 bool z_impl_atomic_ptr_cas(atomic_ptr_t *target, atomic_ptr_val_t old_value,
@@ -142,7 +142,7 @@
 
 	return z_impl_atomic_ptr_cas(target, old_value, new_value);
 }
-#include <syscalls/atomic_ptr_cas_mrsh.c>
+#include <zephyr/syscalls/atomic_ptr_cas_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 /**
@@ -280,7 +280,7 @@
 
 	return z_impl_atomic_ptr_set(target, value);
 }
-#include <syscalls/atomic_ptr_set_mrsh.c>
+#include <zephyr/syscalls/atomic_ptr_set_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 /**
@@ -404,11 +404,11 @@
 ATOMIC_SYSCALL_HANDLER_TARGET_VALUE(atomic_nand);
 
 #ifdef CONFIG_USERSPACE
-#include <syscalls/atomic_add_mrsh.c>
-#include <syscalls/atomic_sub_mrsh.c>
-#include <syscalls/atomic_set_mrsh.c>
-#include <syscalls/atomic_or_mrsh.c>
-#include <syscalls/atomic_xor_mrsh.c>
-#include <syscalls/atomic_and_mrsh.c>
-#include <syscalls/atomic_nand_mrsh.c>
+#include <zephyr/syscalls/atomic_add_mrsh.c>
+#include <zephyr/syscalls/atomic_sub_mrsh.c>
+#include <zephyr/syscalls/atomic_set_mrsh.c>
+#include <zephyr/syscalls/atomic_or_mrsh.c>
+#include <zephyr/syscalls/atomic_xor_mrsh.c>
+#include <zephyr/syscalls/atomic_and_mrsh.c>
+#include <zephyr/syscalls/atomic_nand_mrsh.c>
 #endif /* CONFIG_USERSPACE */

diff --git a/kernel/banner.c b/kernel/banner.c
index dc2506f..d2a431e 100644
--- a/kernel/banner.c
+++ b/kernel/banner.c

@@ -7,7 +7,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/init.h>
 #include <zephyr/device.h>
-#include <version.h>
+#include <zephyr/version.h>
 
 #if defined(CONFIG_BOOT_DELAY) && (CONFIG_BOOT_DELAY > 0)
 #define DELAY_STR STRINGIFY(CONFIG_BOOT_DELAY)

diff --git a/kernel/busy_wait.c b/kernel/busy_wait.c
index cb7c993..da0ea14 100644
--- a/kernel/busy_wait.c
+++ b/kernel/busy_wait.c

@@ -52,5 +52,5 @@
 {
 	z_impl_k_busy_wait(usec_to_wait);
 }
-#include <syscalls/k_busy_wait_mrsh.c>
+#include <zephyr/syscalls/k_busy_wait_mrsh.c>
 #endif /* CONFIG_USERSPACE */

diff --git a/kernel/condvar.c b/kernel/condvar.c
index 2430523..b8d0df9 100644
--- a/kernel/condvar.c
+++ b/kernel/condvar.c

@@ -38,7 +38,7 @@
 	K_OOPS(K_SYSCALL_OBJ_INIT(condvar, K_OBJ_CONDVAR));
 	return z_impl_k_condvar_init(condvar);
 }
-#include <syscalls/k_condvar_init_mrsh.c>
+#include <zephyr/syscalls/k_condvar_init_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 int z_impl_k_condvar_signal(struct k_condvar *condvar)
@@ -70,7 +70,7 @@
 	K_OOPS(K_SYSCALL_OBJ(condvar, K_OBJ_CONDVAR));
 	return z_impl_k_condvar_signal(condvar);
 }
-#include <syscalls/k_condvar_signal_mrsh.c>
+#include <zephyr/syscalls/k_condvar_signal_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 int z_impl_k_condvar_broadcast(struct k_condvar *condvar)
@@ -103,7 +103,7 @@
 	K_OOPS(K_SYSCALL_OBJ(condvar, K_OBJ_CONDVAR));
 	return z_impl_k_condvar_broadcast(condvar);
 }
-#include <syscalls/k_condvar_broadcast_mrsh.c>
+#include <zephyr/syscalls/k_condvar_broadcast_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 int z_impl_k_condvar_wait(struct k_condvar *condvar, struct k_mutex *mutex,
@@ -132,7 +132,7 @@
 	K_OOPS(K_SYSCALL_OBJ(mutex, K_OBJ_MUTEX));
 	return z_impl_k_condvar_wait(condvar, mutex, timeout);
 }
-#include <syscalls/k_condvar_wait_mrsh.c>
+#include <zephyr/syscalls/k_condvar_wait_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 #ifdef CONFIG_OBJ_CORE_CONDVAR

diff --git a/kernel/device.c b/kernel/device.c
index 4b19d24..45806fc 100644
--- a/kernel/device.c
+++ b/kernel/device.c

@@ -66,7 +66,7 @@
 
 	return z_impl_device_get_binding(name_copy);
 }
-#include <syscalls/device_get_binding_mrsh.c>
+#include <zephyr/syscalls/device_get_binding_mrsh.c>
 
 static inline bool z_vrfy_device_is_ready(const struct device *dev)
 {
@@ -74,7 +74,7 @@
 
 	return z_impl_device_is_ready(dev);
 }
-#include <syscalls/device_is_ready_mrsh.c>
+#include <zephyr/syscalls/device_is_ready_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 size_t z_device_get_all_static(struct device const **devices)

diff --git a/kernel/dynamic.c b/kernel/dynamic.c
index 89f8093..a9ec33d 100644
--- a/kernel/dynamic.c
+++ b/kernel/dynamic.c

@@ -105,7 +105,7 @@
 {
 	return z_impl_k_thread_stack_alloc(size, flags);
 }
-#include <syscalls/k_thread_stack_alloc_mrsh.c>
+#include <zephyr/syscalls/k_thread_stack_alloc_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 static void dyn_cb(const struct k_thread *thread, void *user_data)
@@ -177,5 +177,5 @@
 
 	return z_impl_k_thread_stack_free(stack);
 }
-#include <syscalls/k_thread_stack_free_mrsh.c>
+#include <zephyr/syscalls/k_thread_stack_free_mrsh.c>
 #endif /* CONFIG_USERSPACE */

diff --git a/kernel/errno.c b/kernel/errno.c
index 645597f..f268bb7 100644
--- a/kernel/errno.c
+++ b/kernel/errno.c

@@ -43,7 +43,7 @@
 {
 	return z_impl_z_errno();
 }
-#include <syscalls/z_errno_mrsh.c>
+#include <zephyr/syscalls/z_errno_mrsh.c>
 
 #else
 int *z_impl_z_errno(void)

diff --git a/kernel/events.c b/kernel/events.c
index 082f418..d2950e4 100644
--- a/kernel/events.c
+++ b/kernel/events.c

@@ -71,7 +71,7 @@
 	K_OOPS(K_SYSCALL_OBJ_NEVER_INIT(event, K_OBJ_EVENT));
 	z_impl_k_event_init(event);
 }
-#include <syscalls/k_event_init_mrsh.c>
+#include <zephyr/syscalls/k_event_init_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 /**
@@ -190,7 +190,7 @@
 	K_OOPS(K_SYSCALL_OBJ(event, K_OBJ_EVENT));
 	return z_impl_k_event_post(event, events);
 }
-#include <syscalls/k_event_post_mrsh.c>
+#include <zephyr/syscalls/k_event_post_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 uint32_t z_impl_k_event_set(struct k_event *event, uint32_t events)
@@ -204,7 +204,7 @@
 	K_OOPS(K_SYSCALL_OBJ(event, K_OBJ_EVENT));
 	return z_impl_k_event_set(event, events);
 }
-#include <syscalls/k_event_set_mrsh.c>
+#include <zephyr/syscalls/k_event_set_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 uint32_t z_impl_k_event_set_masked(struct k_event *event, uint32_t events,
@@ -220,7 +220,7 @@
 	K_OOPS(K_SYSCALL_OBJ(event, K_OBJ_EVENT));
 	return z_impl_k_event_set_masked(event, events, events_mask);
 }
-#include <syscalls/k_event_set_masked_mrsh.c>
+#include <zephyr/syscalls/k_event_set_masked_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 uint32_t z_impl_k_event_clear(struct k_event *event, uint32_t events)
@@ -234,7 +234,7 @@
 	K_OOPS(K_SYSCALL_OBJ(event, K_OBJ_EVENT));
 	return z_impl_k_event_clear(event, events);
 }
-#include <syscalls/k_event_clear_mrsh.c>
+#include <zephyr/syscalls/k_event_clear_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 static uint32_t k_event_wait_internal(struct k_event *event, uint32_t events,
@@ -320,7 +320,7 @@
 	K_OOPS(K_SYSCALL_OBJ(event, K_OBJ_EVENT));
 	return z_impl_k_event_wait(event, events, reset, timeout);
 }
-#include <syscalls/k_event_wait_mrsh.c>
+#include <zephyr/syscalls/k_event_wait_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 /**
@@ -342,7 +342,7 @@
 	K_OOPS(K_SYSCALL_OBJ(event, K_OBJ_EVENT));
 	return z_impl_k_event_wait_all(event, events, reset, timeout);
 }
-#include <syscalls/k_event_wait_all_mrsh.c>
+#include <zephyr/syscalls/k_event_wait_all_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 #ifdef CONFIG_OBJ_CORE_EVENT

diff --git a/kernel/float.c b/kernel/float.c
index 69e806d..fa81edf 100644
--- a/kernel/float.c
+++ b/kernel/float.c

@@ -35,13 +35,13 @@
 	K_OOPS(K_SYSCALL_OBJ(thread, K_OBJ_THREAD));
 	return z_impl_k_float_disable(thread);
 }
-#include <syscalls/k_float_disable_mrsh.c>
+#include <zephyr/syscalls/k_float_disable_mrsh.c>
 
 static inline int z_vrfy_k_float_enable(struct k_thread *thread, unsigned int options)
 {
 	K_OOPS(K_SYSCALL_OBJ(thread, K_OBJ_THREAD));
 	return z_impl_k_float_enable(thread, options);
 }
-#include <syscalls/k_float_enable_mrsh.c>
+#include <zephyr/syscalls/k_float_enable_mrsh.c>
 
 #endif /* CONFIG_USERSPACE */

diff --git a/kernel/futex.c b/kernel/futex.c
index 813ce0f..86acc0c 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c

@@ -60,7 +60,7 @@
 
 	return z_impl_k_futex_wake(futex, wake_all);
 }
-#include <syscalls/k_futex_wake_mrsh.c>
+#include <zephyr/syscalls/k_futex_wake_mrsh.c>
 
 int z_impl_k_futex_wait(struct k_futex *futex, int expected,
 			k_timeout_t timeout)
@@ -98,4 +98,4 @@
 
 	return z_impl_k_futex_wait(futex, expected, timeout);
 }
-#include <syscalls/k_futex_wait_mrsh.c>
+#include <zephyr/syscalls/k_futex_wait_mrsh.c>

diff --git a/kernel/include/kernel_offsets.h b/kernel/include/kernel_offsets.h
index 41b310a..a7b1f4e 100644
--- a/kernel/include/kernel_offsets.h
+++ b/kernel/include/kernel_offsets.h

@@ -10,7 +10,7 @@
 #ifndef ZEPHYR_KERNEL_INCLUDE_KERNEL_OFFSETS_H_
 #define ZEPHYR_KERNEL_INCLUDE_KERNEL_OFFSETS_H_
 
-#include <syscall_list.h>
+#include <zephyr/syscall_list.h>
 
 /* All of this is build time magic, but LCOV gets confused. Disable coverage
  * for this whole file.

diff --git a/kernel/include/offsets_short.h b/kernel/include/offsets_short.h
index 13e1afe..373d7e0 100644
--- a/kernel/include/offsets_short.h
+++ b/kernel/include/offsets_short.h

@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_KERNEL_INCLUDE_OFFSETS_SHORT_H_
 #define ZEPHYR_KERNEL_INCLUDE_OFFSETS_SHORT_H_
 
-#include <offsets.h>
+#include <zephyr/offsets.h>
 #include <offsets_short_arch.h>
 
 /* kernel */

diff --git a/kernel/init.c b/kernel/init.c
index 00765f5..998cb93 100644
--- a/kernel/init.c
+++ b/kernel/init.c

@@ -395,7 +395,7 @@
 
 	return z_impl_device_init(dev);
 }
-#include <syscalls/device_init_mrsh.c>
+#include <zephyr/syscalls/device_init_mrsh.c>
 #endif
 
 extern void boot_banner(void);

diff --git a/kernel/msg_q.c b/kernel/msg_q.c
index 5214902..0c46109 100644
--- a/kernel/msg_q.c
+++ b/kernel/msg_q.c

@@ -97,7 +97,7 @@
 
 	return z_impl_k_msgq_alloc_init(msgq, msg_size, max_msgs);
 }
-#include <syscalls/k_msgq_alloc_init_mrsh.c>
+#include <zephyr/syscalls/k_msgq_alloc_init_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 int k_msgq_cleanup(struct k_msgq *msgq)
@@ -192,7 +192,7 @@
 
 	return z_impl_k_msgq_put(msgq, data, timeout);
 }
-#include <syscalls/k_msgq_put_mrsh.c>
+#include <zephyr/syscalls/k_msgq_put_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 void z_impl_k_msgq_get_attrs(struct k_msgq *msgq, struct k_msgq_attrs *attrs)
@@ -210,7 +210,7 @@
 	K_OOPS(K_SYSCALL_MEMORY_WRITE(attrs, sizeof(struct k_msgq_attrs)));
 	z_impl_k_msgq_get_attrs(msgq, attrs);
 }
-#include <syscalls/k_msgq_get_attrs_mrsh.c>
+#include <zephyr/syscalls/k_msgq_get_attrs_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 int z_impl_k_msgq_get(struct k_msgq *msgq, void *data, k_timeout_t timeout)
@@ -290,7 +290,7 @@
 
 	return z_impl_k_msgq_get(msgq, data, timeout);
 }
-#include <syscalls/k_msgq_get_mrsh.c>
+#include <zephyr/syscalls/k_msgq_get_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 int z_impl_k_msgq_peek(struct k_msgq *msgq, void *data)
@@ -324,7 +324,7 @@
 
 	return z_impl_k_msgq_peek(msgq, data);
 }
-#include <syscalls/k_msgq_peek_mrsh.c>
+#include <zephyr/syscalls/k_msgq_peek_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 int z_impl_k_msgq_peek_at(struct k_msgq *msgq, void *data, uint32_t idx)
@@ -370,7 +370,7 @@
 
 	return z_impl_k_msgq_peek_at(msgq, data, idx);
 }
-#include <syscalls/k_msgq_peek_at_mrsh.c>
+#include <zephyr/syscalls/k_msgq_peek_at_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 void z_impl_k_msgq_purge(struct k_msgq *msgq)
@@ -401,21 +401,21 @@
 	K_OOPS(K_SYSCALL_OBJ(msgq, K_OBJ_MSGQ));
 	z_impl_k_msgq_purge(msgq);
 }
-#include <syscalls/k_msgq_purge_mrsh.c>
+#include <zephyr/syscalls/k_msgq_purge_mrsh.c>
 
 static inline uint32_t z_vrfy_k_msgq_num_free_get(struct k_msgq *msgq)
 {
 	K_OOPS(K_SYSCALL_OBJ(msgq, K_OBJ_MSGQ));
 	return z_impl_k_msgq_num_free_get(msgq);
 }
-#include <syscalls/k_msgq_num_free_get_mrsh.c>
+#include <zephyr/syscalls/k_msgq_num_free_get_mrsh.c>
 
 static inline uint32_t z_vrfy_k_msgq_num_used_get(struct k_msgq *msgq)
 {
 	K_OOPS(K_SYSCALL_OBJ(msgq, K_OBJ_MSGQ));
 	return z_impl_k_msgq_num_used_get(msgq);
 }
-#include <syscalls/k_msgq_num_used_get_mrsh.c>
+#include <zephyr/syscalls/k_msgq_num_used_get_mrsh.c>
 
 #endif /* CONFIG_USERSPACE */
 

diff --git a/kernel/mutex.c b/kernel/mutex.c
index 3635e76..d60b08c 100644
--- a/kernel/mutex.c
+++ b/kernel/mutex.c

@@ -76,7 +76,7 @@
 	K_OOPS(K_SYSCALL_OBJ_INIT(mutex, K_OBJ_MUTEX));
 	return z_impl_k_mutex_init(mutex);
 }
-#include <syscalls/k_mutex_init_mrsh.c>
+#include <zephyr/syscalls/k_mutex_init_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 static int32_t new_prio_for_inheritance(int32_t target, int32_t limit)
@@ -205,7 +205,7 @@
 	K_OOPS(K_SYSCALL_OBJ(mutex, K_OBJ_MUTEX));
 	return z_impl_k_mutex_lock(mutex, timeout);
 }
-#include <syscalls/k_mutex_lock_mrsh.c>
+#include <zephyr/syscalls/k_mutex_lock_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 int z_impl_k_mutex_unlock(struct k_mutex *mutex)
@@ -289,7 +289,7 @@
 	K_OOPS(K_SYSCALL_OBJ(mutex, K_OBJ_MUTEX));
 	return z_impl_k_mutex_unlock(mutex);
 }
-#include <syscalls/k_mutex_unlock_mrsh.c>
+#include <zephyr/syscalls/k_mutex_unlock_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 #ifdef CONFIG_OBJ_CORE_MUTEX

diff --git a/kernel/paging/statistics.c b/kernel/paging/statistics.c
index 06e867c..c0617af 100644
--- a/kernel/paging/statistics.c
+++ b/kernel/paging/statistics.c

@@ -105,7 +105,7 @@
 	K_OOPS(K_SYSCALL_MEMORY_WRITE(stats, sizeof(*stats)));
 	z_impl_k_mem_paging_stats_get(stats);
 }
-#include <syscalls/k_mem_paging_stats_get_mrsh.c>
+#include <zephyr/syscalls/k_mem_paging_stats_get_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 #ifdef CONFIG_DEMAND_PAGING_THREAD_STATS
@@ -129,7 +129,7 @@
 	K_OOPS(K_SYSCALL_MEMORY_WRITE(stats, sizeof(*stats)));
 	z_impl_k_mem_paging_thread_stats_get(thread, stats);
 }
-#include <syscalls/k_mem_paging_thread_stats_get_mrsh.c>
+#include <zephyr/syscalls/k_mem_paging_thread_stats_get_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 #endif /* CONFIG_DEMAND_PAGING_THREAD_STATS */
@@ -227,7 +227,7 @@
 	K_OOPS(K_SYSCALL_MEMORY_WRITE(hist, sizeof(*hist)));
 	z_impl_k_mem_paging_histogram_eviction_get(hist);
 }
-#include <syscalls/k_mem_paging_histogram_eviction_get_mrsh.c>
+#include <zephyr/syscalls/k_mem_paging_histogram_eviction_get_mrsh.c>
 
 static inline
 void z_vrfy_k_mem_paging_histogram_backing_store_page_in_get(
@@ -236,7 +236,7 @@
 	K_OOPS(K_SYSCALL_MEMORY_WRITE(hist, sizeof(*hist)));
 	z_impl_k_mem_paging_histogram_backing_store_page_in_get(hist);
 }
-#include <syscalls/k_mem_paging_histogram_backing_store_page_in_get_mrsh.c>
+#include <zephyr/syscalls/k_mem_paging_histogram_backing_store_page_in_get_mrsh.c>
 
 static inline
 void z_vrfy_k_mem_paging_histogram_backing_store_page_out_get(
@@ -245,7 +245,7 @@
 	K_OOPS(K_SYSCALL_MEMORY_WRITE(hist, sizeof(*hist)));
 	z_impl_k_mem_paging_histogram_backing_store_page_out_get(hist);
 }
-#include <syscalls/k_mem_paging_histogram_backing_store_page_out_get_mrsh.c>
+#include <zephyr/syscalls/k_mem_paging_histogram_backing_store_page_out_get_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 #endif /* CONFIG_DEMAND_PAGING_TIMING_HISTOGRAM */

diff --git a/kernel/pipes.c b/kernel/pipes.c
index d91a4d6..a81393c 100644
--- a/kernel/pipes.c
+++ b/kernel/pipes.c

@@ -93,7 +93,7 @@
 
 	return z_impl_k_pipe_alloc_init(pipe, size);
 }
-#include <syscalls/k_pipe_alloc_init_mrsh.c>
+#include <zephyr/syscalls/k_pipe_alloc_init_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 static inline void handle_poll_events(struct k_pipe *pipe)
@@ -126,7 +126,7 @@
 
 	z_impl_k_pipe_flush(pipe);
 }
-#include <syscalls/k_pipe_flush_mrsh.c>
+#include <zephyr/syscalls/k_pipe_flush_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 void z_impl_k_pipe_buffer_flush(struct k_pipe *pipe)
@@ -525,7 +525,7 @@
 				 bytes_to_write, bytes_written, min_xfer,
 				 timeout);
 }
-#include <syscalls/k_pipe_put_mrsh.c>
+#include <zephyr/syscalls/k_pipe_put_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 static int pipe_get_internal(k_spinlock_key_t key, struct k_pipe *pipe,
@@ -733,7 +733,7 @@
 				bytes_to_read, bytes_read, min_xfer,
 				timeout);
 }
-#include <syscalls/k_pipe_get_mrsh.c>
+#include <zephyr/syscalls/k_pipe_get_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 size_t z_impl_k_pipe_read_avail(struct k_pipe *pipe)
@@ -770,7 +770,7 @@
 
 	return z_impl_k_pipe_read_avail(pipe);
 }
-#include <syscalls/k_pipe_read_avail_mrsh.c>
+#include <zephyr/syscalls/k_pipe_read_avail_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 size_t z_impl_k_pipe_write_avail(struct k_pipe *pipe)
@@ -807,7 +807,7 @@
 
 	return z_impl_k_pipe_write_avail(pipe);
 }
-#include <syscalls/k_pipe_write_avail_mrsh.c>
+#include <zephyr/syscalls/k_pipe_write_avail_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 #ifdef CONFIG_OBJ_CORE_PIPE

diff --git a/kernel/poll.c b/kernel/poll.c
index 185aba6..502e975 100644
--- a/kernel/poll.c
+++ b/kernel/poll.c

@@ -434,7 +434,7 @@
 	k_free(events_copy);
 	K_OOPS(1);
 }
-#include <syscalls/k_poll_mrsh.c>
+#include <zephyr/syscalls/k_poll_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 /* must be called with interrupts locked */
@@ -493,7 +493,7 @@
 	K_OOPS(K_SYSCALL_OBJ_INIT(sig, K_OBJ_POLL_SIGNAL));
 	z_impl_k_poll_signal_init(sig);
 }
-#include <syscalls/k_poll_signal_init_mrsh.c>
+#include <zephyr/syscalls/k_poll_signal_init_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 void z_impl_k_poll_signal_reset(struct k_poll_signal *sig)
@@ -521,7 +521,7 @@
 	K_OOPS(K_SYSCALL_MEMORY_WRITE(result, sizeof(int)));
 	z_impl_k_poll_signal_check(sig, signaled, result);
 }
-#include <syscalls/k_poll_signal_check_mrsh.c>
+#include <zephyr/syscalls/k_poll_signal_check_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 int z_impl_k_poll_signal_raise(struct k_poll_signal *sig, int result)
@@ -556,14 +556,14 @@
 	K_OOPS(K_SYSCALL_OBJ(sig, K_OBJ_POLL_SIGNAL));
 	return z_impl_k_poll_signal_raise(sig, result);
 }
-#include <syscalls/k_poll_signal_raise_mrsh.c>
+#include <zephyr/syscalls/k_poll_signal_raise_mrsh.c>
 
 static inline void z_vrfy_k_poll_signal_reset(struct k_poll_signal *sig)
 {
 	K_OOPS(K_SYSCALL_OBJ(sig, K_OBJ_POLL_SIGNAL));
 	z_impl_k_poll_signal_reset(sig);
 }
-#include <syscalls/k_poll_signal_reset_mrsh.c>
+#include <zephyr/syscalls/k_poll_signal_reset_mrsh.c>
 
 #endif /* CONFIG_USERSPACE */
 

diff --git a/kernel/queue.c b/kernel/queue.c
index fcccde5..a3c99d6 100644
--- a/kernel/queue.c
+++ b/kernel/queue.c

@@ -75,7 +75,7 @@
 	K_OOPS(K_SYSCALL_OBJ_NEVER_INIT(queue, K_OBJ_QUEUE));
 	z_impl_k_queue_init(queue);
 }
-#include <syscalls/k_queue_init_mrsh.c>
+#include <zephyr/syscalls/k_queue_init_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 static void prepare_thread_to_run(struct k_thread *thread, void *data)
@@ -117,7 +117,7 @@
 	K_OOPS(K_SYSCALL_OBJ(queue, K_OBJ_QUEUE));
 	z_impl_k_queue_cancel_wait(queue);
 }
-#include <syscalls/k_queue_cancel_wait_mrsh.c>
+#include <zephyr/syscalls/k_queue_cancel_wait_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 static int32_t queue_insert(struct k_queue *queue, void *prev, void *data,
@@ -220,7 +220,7 @@
 	K_OOPS(K_SYSCALL_OBJ(queue, K_OBJ_QUEUE));
 	return z_impl_k_queue_alloc_append(queue, data);
 }
-#include <syscalls/k_queue_alloc_append_mrsh.c>
+#include <zephyr/syscalls/k_queue_alloc_append_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 int32_t z_impl_k_queue_alloc_prepend(struct k_queue *queue, void *data)
@@ -241,7 +241,7 @@
 	K_OOPS(K_SYSCALL_OBJ(queue, K_OBJ_QUEUE));
 	return z_impl_k_queue_alloc_prepend(queue, data);
 }
-#include <syscalls/k_queue_alloc_prepend_mrsh.c>
+#include <zephyr/syscalls/k_queue_alloc_prepend_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 int k_queue_append_list(struct k_queue *queue, void *head, void *tail)
@@ -408,28 +408,28 @@
 	K_OOPS(K_SYSCALL_OBJ(queue, K_OBJ_QUEUE));
 	return z_impl_k_queue_get(queue, timeout);
 }
-#include <syscalls/k_queue_get_mrsh.c>
+#include <zephyr/syscalls/k_queue_get_mrsh.c>
 
 static inline int z_vrfy_k_queue_is_empty(struct k_queue *queue)
 {
 	K_OOPS(K_SYSCALL_OBJ(queue, K_OBJ_QUEUE));
 	return z_impl_k_queue_is_empty(queue);
 }
-#include <syscalls/k_queue_is_empty_mrsh.c>
+#include <zephyr/syscalls/k_queue_is_empty_mrsh.c>
 
 static inline void *z_vrfy_k_queue_peek_head(struct k_queue *queue)
 {
 	K_OOPS(K_SYSCALL_OBJ(queue, K_OBJ_QUEUE));
 	return z_impl_k_queue_peek_head(queue);
 }
-#include <syscalls/k_queue_peek_head_mrsh.c>
+#include <zephyr/syscalls/k_queue_peek_head_mrsh.c>
 
 static inline void *z_vrfy_k_queue_peek_tail(struct k_queue *queue)
 {
 	K_OOPS(K_SYSCALL_OBJ(queue, K_OBJ_QUEUE));
 	return z_impl_k_queue_peek_tail(queue);
 }
-#include <syscalls/k_queue_peek_tail_mrsh.c>
+#include <zephyr/syscalls/k_queue_peek_tail_mrsh.c>
 
 #endif /* CONFIG_USERSPACE */
 

diff --git a/kernel/sched.c b/kernel/sched.c
index 98de4f7..506ad57 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c

@@ -521,7 +521,7 @@
 	K_OOPS(K_SYSCALL_OBJ(thread, K_OBJ_THREAD));
 	z_impl_k_thread_suspend(thread);
 }
-#include <syscalls/k_thread_suspend_mrsh.c>
+#include <zephyr/syscalls/k_thread_suspend_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 void z_impl_k_thread_resume(struct k_thread *thread)
@@ -550,7 +550,7 @@
 	K_OOPS(K_SYSCALL_OBJ(thread, K_OBJ_THREAD));
 	z_impl_k_thread_resume(thread);
 }
-#include <syscalls/k_thread_resume_mrsh.c>
+#include <zephyr/syscalls/k_thread_resume_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 static _wait_q_t *pended_on_thread(struct k_thread *thread)
@@ -1025,7 +1025,7 @@
 #endif /* CONFIG_USERSPACE_THREAD_MAY_RAISE_PRIORITY */
 	z_impl_k_thread_priority_set(thread, prio);
 }
-#include <syscalls/k_thread_priority_set_mrsh.c>
+#include <zephyr/syscalls/k_thread_priority_set_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 #ifdef CONFIG_SCHED_DEADLINE
@@ -1063,7 +1063,7 @@
 
 	z_impl_k_thread_deadline_set((k_tid_t)thread, deadline);
 }
-#include <syscalls/k_thread_deadline_set_mrsh.c>
+#include <zephyr/syscalls/k_thread_deadline_set_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 #endif /* CONFIG_SCHED_DEADLINE */
 
@@ -1095,7 +1095,7 @@
 {
 	z_impl_k_yield();
 }
-#include <syscalls/k_yield_mrsh.c>
+#include <zephyr/syscalls/k_yield_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 static int32_t z_tick_sleep(k_ticks_t ticks)
@@ -1173,7 +1173,7 @@
 {
 	return z_impl_k_sleep(timeout);
 }
-#include <syscalls/k_sleep_mrsh.c>
+#include <zephyr/syscalls/k_sleep_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 int32_t z_impl_k_usleep(int us)
@@ -1197,7 +1197,7 @@
 {
 	return z_impl_k_usleep(us);
 }
-#include <syscalls/k_usleep_mrsh.c>
+#include <zephyr/syscalls/k_usleep_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 void z_impl_k_wakeup(k_tid_t thread)
@@ -1236,7 +1236,7 @@
 	K_OOPS(K_SYSCALL_OBJ(thread, K_OBJ_THREAD));
 	z_impl_k_wakeup(thread);
 }
-#include <syscalls/k_wakeup_mrsh.c>
+#include <zephyr/syscalls/k_wakeup_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 k_tid_t z_impl_k_sched_current_thread_query(void)
@@ -1262,7 +1262,7 @@
 {
 	return z_impl_k_sched_current_thread_query();
 }
-#include <syscalls/k_sched_current_thread_query_mrsh.c>
+#include <zephyr/syscalls/k_sched_current_thread_query_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 static inline void unpend_all(_wait_q_t *wait_q)
@@ -1485,7 +1485,7 @@
 
 	return z_impl_k_thread_join(thread, timeout);
 }
-#include <syscalls/k_thread_join_mrsh.c>
+#include <zephyr/syscalls/k_thread_join_mrsh.c>
 
 static inline void z_vrfy_k_thread_abort(k_tid_t thread)
 {
@@ -1498,7 +1498,7 @@
 
 	z_impl_k_thread_abort((struct k_thread *)thread);
 }
-#include <syscalls/k_thread_abort_mrsh.c>
+#include <zephyr/syscalls/k_thread_abort_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 /*

diff --git a/kernel/sem.c b/kernel/sem.c
index 0a8b861..f2ae7a6 100644
--- a/kernel/sem.c
+++ b/kernel/sem.c

@@ -79,7 +79,7 @@
 	K_OOPS(K_SYSCALL_OBJ_INIT(sem, K_OBJ_SEM));
 	return z_impl_k_sem_init(sem, initial_count, limit);
 }
-#include <syscalls/k_sem_init_mrsh.c>
+#include <zephyr/syscalls/k_sem_init_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 static inline bool handle_poll_events(struct k_sem *sem)
@@ -126,7 +126,7 @@
 	K_OOPS(K_SYSCALL_OBJ(sem, K_OBJ_SEM));
 	z_impl_k_sem_give(sem);
 }
-#include <syscalls/k_sem_give_mrsh.c>
+#include <zephyr/syscalls/k_sem_give_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 int z_impl_k_sem_take(struct k_sem *sem, k_timeout_t timeout)
@@ -191,21 +191,21 @@
 	K_OOPS(K_SYSCALL_OBJ(sem, K_OBJ_SEM));
 	return z_impl_k_sem_take(sem, timeout);
 }
-#include <syscalls/k_sem_take_mrsh.c>
+#include <zephyr/syscalls/k_sem_take_mrsh.c>
 
 static inline void z_vrfy_k_sem_reset(struct k_sem *sem)
 {
 	K_OOPS(K_SYSCALL_OBJ(sem, K_OBJ_SEM));
 	z_impl_k_sem_reset(sem);
 }
-#include <syscalls/k_sem_reset_mrsh.c>
+#include <zephyr/syscalls/k_sem_reset_mrsh.c>
 
 static inline unsigned int z_vrfy_k_sem_count_get(struct k_sem *sem)
 {
 	K_OOPS(K_SYSCALL_OBJ(sem, K_OBJ_SEM));
 	return z_impl_k_sem_count_get(sem);
 }
-#include <syscalls/k_sem_count_get_mrsh.c>
+#include <zephyr/syscalls/k_sem_count_get_mrsh.c>
 
 #endif /* CONFIG_USERSPACE */
 

diff --git a/kernel/stack.c b/kernel/stack.c
index 5c2bae6..e637cc3 100644
--- a/kernel/stack.c
+++ b/kernel/stack.c

@@ -74,7 +74,7 @@
 					&total_size)));
 	return z_impl_k_stack_alloc_init(stack, num_entries);
 }
-#include <syscalls/k_stack_alloc_init_mrsh.c>
+#include <zephyr/syscalls/k_stack_alloc_init_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 int k_stack_cleanup(struct k_stack *stack)
@@ -142,7 +142,7 @@
 
 	return z_impl_k_stack_push(stack, data);
 }
-#include <syscalls/k_stack_push_mrsh.c>
+#include <zephyr/syscalls/k_stack_push_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 int z_impl_k_stack_pop(struct k_stack *stack, stack_data_t *data,
@@ -197,7 +197,7 @@
 	K_OOPS(K_SYSCALL_MEMORY_WRITE(data, sizeof(stack_data_t)));
 	return z_impl_k_stack_pop(stack, data, timeout);
 }
-#include <syscalls/k_stack_pop_mrsh.c>
+#include <zephyr/syscalls/k_stack_pop_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 #ifdef CONFIG_OBJ_CORE_STACK

diff --git a/kernel/thread.c b/kernel/thread.c
index 3b19774..7b458d1 100644
--- a/kernel/thread.c
+++ b/kernel/thread.c

@@ -90,7 +90,7 @@
 {
 	z_impl_k_thread_custom_data_set(data);
 }
-#include <syscalls/k_thread_custom_data_set_mrsh.c>
+#include <zephyr/syscalls/k_thread_custom_data_set_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 void *z_impl_k_thread_custom_data_get(void)
@@ -103,7 +103,7 @@
 {
 	return z_impl_k_thread_custom_data_get();
 }
-#include <syscalls/k_thread_custom_data_get_mrsh.c>
+#include <zephyr/syscalls/k_thread_custom_data_get_mrsh.c>
 
 #endif /* CONFIG_USERSPACE */
 #endif /* CONFIG_THREAD_CUSTOM_DATA */
@@ -118,7 +118,7 @@
 {
 	return z_impl_k_is_preempt_thread();
 }
-#include <syscalls/k_is_preempt_thread_mrsh.c>
+#include <zephyr/syscalls/k_is_preempt_thread_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 int z_impl_k_thread_priority_get(k_tid_t thread)
@@ -132,7 +132,7 @@
 	K_OOPS(K_SYSCALL_OBJ(thread, K_OBJ_THREAD));
 	return z_impl_k_thread_priority_get(thread);
 }
-#include <syscalls/k_thread_priority_get_mrsh.c>
+#include <zephyr/syscalls/k_thread_priority_get_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 int z_impl_k_thread_name_set(struct k_thread *thread, const char *value)
@@ -183,7 +183,7 @@
 	return -ENOSYS;
 #endif /* CONFIG_THREAD_NAME */
 }
-#include <syscalls/k_thread_name_set_mrsh.c>
+#include <zephyr/syscalls/k_thread_name_set_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 const char *k_thread_name_get(k_tid_t thread)
@@ -304,7 +304,7 @@
 	return -ENOSYS;
 #endif /* CONFIG_THREAD_NAME */
 }
-#include <syscalls/k_thread_name_copy_mrsh.c>
+#include <zephyr/syscalls/k_thread_name_copy_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 #ifdef CONFIG_STACK_SENTINEL
@@ -353,7 +353,7 @@
 	K_OOPS(K_SYSCALL_OBJ(thread, K_OBJ_THREAD));
 	return z_impl_k_thread_start(thread);
 }
-#include <syscalls/k_thread_start_mrsh.c>
+#include <zephyr/syscalls/k_thread_start_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 #if defined(CONFIG_STACK_POINTER_RANDOM) && (CONFIG_STACK_POINTER_RANDOM != 0)
@@ -741,7 +741,7 @@
 
 	return new_thread;
 }
-#include <syscalls/k_thread_create_mrsh.c>
+#include <zephyr/syscalls/k_thread_create_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 void z_init_thread_base(struct _thread_base *thread_base, int priority,
@@ -895,7 +895,7 @@
 
 	return 0;
 }
-#include <syscalls/k_thread_stack_space_get_mrsh.c>
+#include <zephyr/syscalls/k_thread_stack_space_get_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 #endif /* CONFIG_INIT_STACKS && CONFIG_THREAD_STACK_INFO */
 
@@ -906,7 +906,7 @@
 	K_OOPS(K_SYSCALL_OBJ(thread, K_OBJ_THREAD));
 	return z_impl_k_thread_timeout_remaining_ticks(thread);
 }
-#include <syscalls/k_thread_timeout_remaining_ticks_mrsh.c>
+#include <zephyr/syscalls/k_thread_timeout_remaining_ticks_mrsh.c>
 
 static inline k_ticks_t z_vrfy_k_thread_timeout_expires_ticks(
 						  const struct k_thread *thread)
@@ -914,7 +914,7 @@
 	K_OOPS(K_SYSCALL_OBJ(thread, K_OBJ_THREAD));
 	return z_impl_k_thread_timeout_expires_ticks(thread);
 }
-#include <syscalls/k_thread_timeout_expires_ticks_mrsh.c>
+#include <zephyr/syscalls/k_thread_timeout_expires_ticks_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 #ifdef CONFIG_INSTRUMENT_THREAD_SWITCHING

diff --git a/kernel/timeout.c b/kernel/timeout.c
index cf4a6d6..1a8a361 100644
--- a/kernel/timeout.c
+++ b/kernel/timeout.c

@@ -32,7 +32,7 @@
 {
 	return z_impl_sys_clock_hw_cycles_per_sec_runtime_get();
 }
-#include <syscalls/sys_clock_hw_cycles_per_sec_runtime_get_mrsh.c>
+#include <zephyr/syscalls/sys_clock_hw_cycles_per_sec_runtime_get_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 #endif /* CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME */
 
@@ -287,7 +287,7 @@
 {
 	return z_impl_k_uptime_ticks();
 }
-#include <syscalls/k_uptime_ticks_mrsh.c>
+#include <zephyr/syscalls/k_uptime_ticks_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 k_timepoint_t sys_timepoint_calc(k_timeout_t timeout)

diff --git a/kernel/timer.c b/kernel/timer.c
index 8eafbb4..466cab6 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c

@@ -188,7 +188,7 @@
 	K_OOPS(K_SYSCALL_OBJ(timer, K_OBJ_TIMER));
 	z_impl_k_timer_start(timer, duration, period);
 }
-#include <syscalls/k_timer_start_mrsh.c>
+#include <zephyr/syscalls/k_timer_start_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 void z_impl_k_timer_stop(struct k_timer *timer)
@@ -221,7 +221,7 @@
 	K_OOPS(K_SYSCALL_OBJ(timer, K_OBJ_TIMER));
 	z_impl_k_timer_stop(timer);
 }
-#include <syscalls/k_timer_stop_mrsh.c>
+#include <zephyr/syscalls/k_timer_stop_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 uint32_t z_impl_k_timer_status_get(struct k_timer *timer)
@@ -241,7 +241,7 @@
 	K_OOPS(K_SYSCALL_OBJ(timer, K_OBJ_TIMER));
 	return z_impl_k_timer_status_get(timer);
 }
-#include <syscalls/k_timer_status_get_mrsh.c>
+#include <zephyr/syscalls/k_timer_status_get_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 
 uint32_t z_impl_k_timer_status_sync(struct k_timer *timer)
@@ -309,7 +309,7 @@
 	K_OOPS(K_SYSCALL_OBJ(timer, K_OBJ_TIMER));
 	return z_impl_k_timer_status_sync(timer);
 }
-#include <syscalls/k_timer_status_sync_mrsh.c>
+#include <zephyr/syscalls/k_timer_status_sync_mrsh.c>
 
 static inline k_ticks_t z_vrfy_k_timer_remaining_ticks(
 						const struct k_timer *timer)
@@ -317,7 +317,7 @@
 	K_OOPS(K_SYSCALL_OBJ(timer, K_OBJ_TIMER));
 	return z_impl_k_timer_remaining_ticks(timer);
 }
-#include <syscalls/k_timer_remaining_ticks_mrsh.c>
+#include <zephyr/syscalls/k_timer_remaining_ticks_mrsh.c>
 
 static inline k_ticks_t z_vrfy_k_timer_expires_ticks(
 						const struct k_timer *timer)
@@ -325,14 +325,14 @@
 	K_OOPS(K_SYSCALL_OBJ(timer, K_OBJ_TIMER));
 	return z_impl_k_timer_expires_ticks(timer);
 }
-#include <syscalls/k_timer_expires_ticks_mrsh.c>
+#include <zephyr/syscalls/k_timer_expires_ticks_mrsh.c>
 
 static inline void *z_vrfy_k_timer_user_data_get(const struct k_timer *timer)
 {
 	K_OOPS(K_SYSCALL_OBJ(timer, K_OBJ_TIMER));
 	return z_impl_k_timer_user_data_get(timer);
 }
-#include <syscalls/k_timer_user_data_get_mrsh.c>
+#include <zephyr/syscalls/k_timer_user_data_get_mrsh.c>
 
 static inline void z_vrfy_k_timer_user_data_set(struct k_timer *timer,
 						void *user_data)
@@ -340,7 +340,7 @@
 	K_OOPS(K_SYSCALL_OBJ(timer, K_OBJ_TIMER));
 	z_impl_k_timer_user_data_set(timer, user_data);
 }
-#include <syscalls/k_timer_user_data_set_mrsh.c>
+#include <zephyr/syscalls/k_timer_user_data_set_mrsh.c>
 
 #endif /* CONFIG_USERSPACE */
 

diff --git a/kernel/userspace.c b/kernel/userspace.c
index 664971e..5543258 100644
--- a/kernel/userspace.c
+++ b/kernel/userspace.c

@@ -94,7 +94,7 @@
 	case K_OBJ_ANY:
 		ret = "generic";
 		break;
-#include <otype-to-str.h>
+#include <zephyr/otype-to-str.h>
 	default:
 		ret = "?";
 		break;
@@ -192,7 +192,7 @@
 	size_t ret;
 
 	switch (otype) {
-#include <otype-to-size.h>
+#include <zephyr/otype-to-size.h>
 	default:
 		ret = sizeof(const struct device);
 		break;

diff --git a/kernel/userspace_handler.c b/kernel/userspace_handler.c
index da4053b..ab6e4f0 100644
--- a/kernel/userspace_handler.c
+++ b/kernel/userspace_handler.c

@@ -64,7 +64,7 @@
 				    object));
 	k_thread_perms_set(ko, thread);
 }
-#include <syscalls/k_object_access_grant_mrsh.c>
+#include <zephyr/syscalls/k_object_access_grant_mrsh.c>
 
 static inline void z_vrfy_k_object_release(const void *object)
 {
@@ -74,16 +74,16 @@
 	K_OOPS(K_SYSCALL_VERIFY_MSG(ko != NULL, "object %p access denied", object));
 	k_thread_perms_clear(ko, _current);
 }
-#include <syscalls/k_object_release_mrsh.c>
+#include <zephyr/syscalls/k_object_release_mrsh.c>
 
 static inline void *z_vrfy_k_object_alloc(enum k_objects otype)
 {
 	return z_impl_k_object_alloc(otype);
 }
-#include <syscalls/k_object_alloc_mrsh.c>
+#include <zephyr/syscalls/k_object_alloc_mrsh.c>
 
 static inline void *z_vrfy_k_object_alloc_size(enum k_objects otype, size_t size)
 {
 	return z_impl_k_object_alloc_size(otype, size);
 }
-#include <syscalls/k_object_alloc_size_mrsh.c>
+#include <zephyr/syscalls/k_object_alloc_size_mrsh.c>

diff --git a/kernel/version.c b/kernel/version.c
index 799e555..029671f 100644
--- a/kernel/version.c
+++ b/kernel/version.c

@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/types.h>
-#include "version.h" /* generated by MAKE, at compile time */
+#include <zephyr/version.h> /* generated by MAKE, at compile time */
 
 /**
  * @brief Return the kernel version of the present build