Index: kernel/generic/src/console/kconsole.c
===================================================================
--- kernel/generic/src/console/kconsole.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/console/kconsole.c	(revision 43dd2d4bd224eef76be6ddfb6d7228a2edf11ec2)
@@ -156,5 +156,5 @@
 
 /** Print count times a character */
-NO_TRACE static void print_cc(wchar_t ch, size_t count)
+_NO_TRACE static void print_cc(wchar_t ch, size_t count)
 {
 	size_t i;
@@ -203,5 +203,5 @@
  *
  */
-NO_TRACE static int cmdtab_compl(char *input, size_t size, indev_t *indev,
+_NO_TRACE static int cmdtab_compl(char *input, size_t size, indev_t *indev,
     hints_enum_func_t hints_enum)
 {
@@ -290,5 +290,5 @@
 }
 
-NO_TRACE static cmd_info_t *parse_cmd(const wchar_t *cmdline)
+_NO_TRACE static cmd_info_t *parse_cmd(const wchar_t *cmdline)
 {
 	size_t start = 0;
@@ -331,5 +331,5 @@
 }
 
-NO_TRACE static wchar_t *clever_readline(const char *prompt, indev_t *indev,
+_NO_TRACE static wchar_t *clever_readline(const char *prompt, indev_t *indev,
     char *tmp)
 {
@@ -548,5 +548,5 @@
 }
 
-NO_TRACE static bool parse_int_arg(const char *text, size_t len,
+_NO_TRACE static bool parse_int_arg(const char *text, size_t len,
     sysarg_t *result)
 {
@@ -637,5 +637,5 @@
  *
  */
-NO_TRACE static bool parse_argument(const char *cmdline, size_t size,
+_NO_TRACE static bool parse_argument(const char *cmdline, size_t size,
     size_t *start, size_t *end)
 {
@@ -674,5 +674,5 @@
  *
  */
-NO_TRACE static cmd_info_t *parse_cmdline(const char *cmdline, size_t size)
+_NO_TRACE static cmd_info_t *parse_cmdline(const char *cmdline, size_t size)
 {
 	size_t start = 0;
Index: kernel/generic/src/ddi/ddi.c
===================================================================
--- kernel/generic/src/ddi/ddi.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/ddi/ddi.c	(revision 43dd2d4bd224eef76be6ddfb6d7228a2edf11ec2)
@@ -121,5 +121,5 @@
  *
  */
-NO_TRACE static errno_t physmem_map(uintptr_t phys, size_t pages,
+_NO_TRACE static errno_t physmem_map(uintptr_t phys, size_t pages,
     unsigned int flags, uintptr_t *virt, uintptr_t bound)
 {
@@ -227,5 +227,5 @@
 }
 
-NO_TRACE static errno_t physmem_unmap(uintptr_t virt)
+_NO_TRACE static errno_t physmem_unmap(uintptr_t virt)
 {
 	assert(TASK);
@@ -312,5 +312,5 @@
  *
  */
-NO_TRACE static errno_t iospace_enable(task_id_t id, uintptr_t ioaddr, size_t size)
+_NO_TRACE static errno_t iospace_enable(task_id_t id, uintptr_t ioaddr, size_t size)
 {
 	/*
@@ -353,5 +353,5 @@
  *
  */
-NO_TRACE static errno_t iospace_disable(task_id_t id, uintptr_t ioaddr, size_t size)
+_NO_TRACE static errno_t iospace_disable(task_id_t id, uintptr_t ioaddr, size_t size)
 {
 	/*
@@ -413,5 +413,5 @@
 }
 
-NO_TRACE static errno_t dmamem_map(uintptr_t virt, size_t size, unsigned int map_flags,
+_NO_TRACE static errno_t dmamem_map(uintptr_t virt, size_t size, unsigned int map_flags,
     unsigned int flags, uintptr_t *phys)
 {
@@ -422,5 +422,5 @@
 }
 
-NO_TRACE static errno_t dmamem_map_anonymous(size_t size, uintptr_t constraint,
+_NO_TRACE static errno_t dmamem_map_anonymous(size_t size, uintptr_t constraint,
     unsigned int map_flags, unsigned int flags, uintptr_t *phys,
     uintptr_t *virt, uintptr_t bound)
@@ -451,5 +451,5 @@
 }
 
-NO_TRACE static errno_t dmamem_unmap(uintptr_t virt, size_t size)
+_NO_TRACE static errno_t dmamem_unmap(uintptr_t virt, size_t size)
 {
 	// TODO: implement unlocking & unmap
@@ -457,5 +457,5 @@
 }
 
-NO_TRACE static errno_t dmamem_unmap_anonymous(uintptr_t virt)
+_NO_TRACE static errno_t dmamem_unmap_anonymous(uintptr_t virt)
 {
 	return as_area_destroy(TASK->as, virt);
Index: kernel/generic/src/interrupt/interrupt.c
===================================================================
--- kernel/generic/src/interrupt/interrupt.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/interrupt/interrupt.c	(revision 43dd2d4bd224eef76be6ddfb6d7228a2edf11ec2)
@@ -99,5 +99,5 @@
  *
  */
-NO_TRACE void exc_dispatch(unsigned int n, istate_t *istate)
+_NO_TRACE void exc_dispatch(unsigned int n, istate_t *istate)
 {
 #if (IVT_ITEMS > 0)
@@ -159,5 +159,5 @@
  *
  */
-NO_TRACE static void exc_undef(unsigned int n, istate_t *istate)
+_NO_TRACE static void exc_undef(unsigned int n, istate_t *istate)
 {
 	fault_if_from_uspace(istate, "Unhandled exception %u.", n);
@@ -165,5 +165,5 @@
 }
 
-static NO_TRACE void
+static _NO_TRACE void
 fault_from_uspace_core(istate_t *istate, const char *fmt, va_list args)
 {
@@ -185,5 +185,5 @@
  *
  */
-NO_TRACE void fault_from_uspace(istate_t *istate, const char *fmt, ...)
+_NO_TRACE void fault_from_uspace(istate_t *istate, const char *fmt, ...)
 {
 	va_list args;
@@ -197,5 +197,5 @@
  *
  */
-NO_TRACE void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
+_NO_TRACE void fault_if_from_uspace(istate_t *istate, const char *fmt, ...)
 {
 	if (!istate_from_uspace(istate))
@@ -233,5 +233,5 @@
  *
  */
-NO_TRACE static int cmd_exc_print(cmd_arg_t *argv)
+_NO_TRACE static int cmd_exc_print(cmd_arg_t *argv)
 {
 	bool excs_all;
Index: kernel/generic/src/main/main.c
===================================================================
--- kernel/generic/src/main/main.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/main/main.c	(revision 43dd2d4bd224eef76be6ddfb6d7228a2edf11ec2)
@@ -160,5 +160,5 @@
  *
  */
-NO_TRACE void main_bsp(void)
+_NO_TRACE void main_bsp(void)
 {
 	config.cpu_count = 1;
Index: kernel/generic/src/mm/as.c
===================================================================
--- kernel/generic/src/mm/as.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/mm/as.c	(revision 43dd2d4bd224eef76be6ddfb6d7228a2edf11ec2)
@@ -127,5 +127,5 @@
 static void used_space_shorten_ival(used_space_ival_t *, size_t);
 
-NO_TRACE static errno_t as_constructor(void *obj, unsigned int flags)
+_NO_TRACE static errno_t as_constructor(void *obj, unsigned int flags)
 {
 	as_t *as = (as_t *) obj;
@@ -137,5 +137,5 @@
 }
 
-NO_TRACE static size_t as_destructor(void *obj)
+_NO_TRACE static size_t as_destructor(void *obj)
 {
 	return as_destructor_arch((as_t *) obj);
@@ -281,5 +281,5 @@
  *
  */
-NO_TRACE void as_hold(as_t *as)
+_NO_TRACE void as_hold(as_t *as)
 {
 	refcount_up(&as->refcount);
@@ -294,5 +294,5 @@
  *
  */
-NO_TRACE void as_release(as_t *as)
+_NO_TRACE void as_release(as_t *as)
 {
 	if (refcount_down(&as->refcount))
@@ -340,5 +340,5 @@
  * @return True if the two areas conflict, false otherwise.
  */
-NO_TRACE static bool area_is_conflicting(uintptr_t addr,
+_NO_TRACE static bool area_is_conflicting(uintptr_t addr,
     size_t count, bool guarded, as_area_t *area)
 {
@@ -380,5 +380,5 @@
  *
  */
-NO_TRACE static bool check_area_conflicts(as_t *as, uintptr_t addr,
+_NO_TRACE static bool check_area_conflicts(as_t *as, uintptr_t addr,
     size_t count, bool guarded, as_area_t *avoid)
 {
@@ -474,5 +474,5 @@
  *
  */
-NO_TRACE static uintptr_t as_get_unmapped_area(as_t *as, uintptr_t bound,
+_NO_TRACE static uintptr_t as_get_unmapped_area(as_t *as, uintptr_t bound,
     size_t size, bool guarded)
 {
@@ -580,5 +580,5 @@
  * @param pagemap Pagemap
  */
-NO_TRACE void as_pagemap_initialize(as_pagemap_t *pagemap)
+_NO_TRACE void as_pagemap_initialize(as_pagemap_t *pagemap)
 {
 	odict_initialize(&pagemap->map, as_pagemap_getkey, as_pagemap_cmp);
@@ -591,5 +591,5 @@
  * @param pagemap Pagemap
  */
-NO_TRACE void as_pagemap_finalize(as_pagemap_t *pagemap)
+_NO_TRACE void as_pagemap_finalize(as_pagemap_t *pagemap)
 {
 	as_page_mapping_t *mapping = as_pagemap_first(pagemap);
@@ -606,5 +606,5 @@
  * @return First mapping or @c NULL if there is none
  */
-NO_TRACE as_page_mapping_t *as_pagemap_first(as_pagemap_t *pagemap)
+_NO_TRACE as_page_mapping_t *as_pagemap_first(as_pagemap_t *pagemap)
 {
 	odlink_t *odlink;
@@ -622,5 +622,5 @@
  * @return Next mapping or @c NULL if @a cur is the last one
  */
-NO_TRACE as_page_mapping_t *as_pagemap_next(as_page_mapping_t *cur)
+_NO_TRACE as_page_mapping_t *as_pagemap_next(as_page_mapping_t *cur)
 {
 	odlink_t *odlink;
@@ -640,5 +640,5 @@
  * @return EOK on succcess or ENOENT if no mapping found
  */
-NO_TRACE errno_t as_pagemap_find(as_pagemap_t *pagemap, uintptr_t vaddr,
+_NO_TRACE errno_t as_pagemap_find(as_pagemap_t *pagemap, uintptr_t vaddr,
     uintptr_t *rframe)
 {
@@ -663,5 +663,5 @@
  * @param frame Physical frame address
  */
-NO_TRACE void as_pagemap_insert(as_pagemap_t *pagemap, uintptr_t vaddr,
+_NO_TRACE void as_pagemap_insert(as_pagemap_t *pagemap, uintptr_t vaddr,
     uintptr_t frame)
 {
@@ -680,5 +680,5 @@
  * @param mapping Mapping
  */
-NO_TRACE void as_pagemap_remove(as_page_mapping_t *mapping)
+_NO_TRACE void as_pagemap_remove(as_page_mapping_t *mapping)
 {
 	odict_remove(&mapping->lpagemap);
@@ -693,5 +693,5 @@
  *
  */
-NO_TRACE static void sh_info_remove_reference(share_info_t *sh_info)
+_NO_TRACE static void sh_info_remove_reference(share_info_t *sh_info)
 {
 	bool dealloc = false;
@@ -861,5 +861,5 @@
  *
  */
-NO_TRACE static as_area_t *find_area_and_lock(as_t *as, uintptr_t va)
+_NO_TRACE static as_area_t *find_area_and_lock(as_t *as, uintptr_t va)
 {
 	assert(mutex_locked(&as->lock));
@@ -1305,5 +1305,5 @@
  *
  */
-NO_TRACE bool as_area_check_access(as_area_t *area, pf_access_t access)
+_NO_TRACE bool as_area_check_access(as_area_t *area, pf_access_t access)
 {
 	assert(mutex_locked(&area->lock));
@@ -1328,5 +1328,5 @@
  *
  */
-NO_TRACE static unsigned int area_flags_to_page_flags(unsigned int aflags)
+_NO_TRACE static unsigned int area_flags_to_page_flags(unsigned int aflags)
 {
 	unsigned int flags = PAGE_USER | PAGE_PRESENT;
@@ -1698,5 +1698,5 @@
  *
  */
-NO_TRACE unsigned int as_area_get_flags(as_area_t *area)
+_NO_TRACE unsigned int as_area_get_flags(as_area_t *area)
 {
 	assert(mutex_locked(&area->lock));
@@ -1746,5 +1746,5 @@
  *
  */
-NO_TRACE pte_t *page_table_create(unsigned int flags)
+_NO_TRACE pte_t *page_table_create(unsigned int flags)
 {
 	assert(as_operations);
@@ -1761,5 +1761,5 @@
  *
  */
-NO_TRACE void page_table_destroy(pte_t *page_table)
+_NO_TRACE void page_table_destroy(pte_t *page_table)
 {
 	assert(as_operations);
@@ -1782,5 +1782,5 @@
  *
  */
-NO_TRACE void page_table_lock(as_t *as, bool lock)
+_NO_TRACE void page_table_lock(as_t *as, bool lock)
 {
 	assert(as_operations);
@@ -1796,5 +1796,5 @@
  *
  */
-NO_TRACE void page_table_unlock(as_t *as, bool unlock)
+_NO_TRACE void page_table_unlock(as_t *as, bool unlock)
 {
 	assert(as_operations);
@@ -1811,5 +1811,5 @@
  *         are locked, otherwise false.
  */
-NO_TRACE bool page_table_locked(as_t *as)
+_NO_TRACE bool page_table_locked(as_t *as)
 {
 	assert(as_operations);
Index: kernel/generic/src/mm/frame.c
===================================================================
--- kernel/generic/src/mm/frame.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/mm/frame.c	(revision 43dd2d4bd224eef76be6ddfb6d7228a2edf11ec2)
@@ -79,5 +79,5 @@
  *
  */
-NO_TRACE static void frame_initialize(frame_t *frame)
+_NO_TRACE static void frame_initialize(frame_t *frame)
 {
 	frame->refcount = 0;
@@ -100,5 +100,5 @@
  *
  */
-NO_TRACE static size_t zones_insert_zone(pfn_t base, size_t count,
+_NO_TRACE static size_t zones_insert_zone(pfn_t base, size_t count,
     zone_flags_t flags)
 {
@@ -156,5 +156,5 @@
  *
  */
-NO_TRACE static size_t frame_total_free_get_internal(void)
+_NO_TRACE static size_t frame_total_free_get_internal(void)
 {
 	size_t total = 0;
@@ -167,5 +167,5 @@
 }
 
-NO_TRACE size_t frame_total_free_get(void)
+_NO_TRACE size_t frame_total_free_get(void)
 {
 	size_t total;
@@ -190,5 +190,5 @@
  *
  */
-NO_TRACE size_t find_zone(pfn_t frame, size_t count, size_t hint)
+_NO_TRACE size_t find_zone(pfn_t frame, size_t count, size_t hint)
 {
 	if (hint >= zones.count)
@@ -211,5 +211,5 @@
 
 /** @return True if zone can allocate specified number of frames */
-NO_TRACE static bool zone_can_alloc(zone_t *zone, size_t count,
+_NO_TRACE static bool zone_can_alloc(zone_t *zone, size_t count,
     pfn_t constraint)
 {
@@ -239,5 +239,5 @@
  *
  */
-NO_TRACE static size_t find_free_zone_all(size_t count, zone_flags_t flags,
+_NO_TRACE static size_t find_free_zone_all(size_t count, zone_flags_t flags,
     pfn_t constraint, size_t hint)
 {
@@ -265,5 +265,5 @@
  *
  */
-NO_TRACE static bool is_high_priority(pfn_t base, size_t count)
+_NO_TRACE static bool is_high_priority(pfn_t base, size_t count)
 {
 	return (base + count <= FRAME_LOWPRIO);
@@ -285,5 +285,5 @@
  *
  */
-NO_TRACE static size_t find_free_zone_lowprio(size_t count, zone_flags_t flags,
+_NO_TRACE static size_t find_free_zone_lowprio(size_t count, zone_flags_t flags,
     pfn_t constraint, size_t hint)
 {
@@ -322,5 +322,5 @@
  *
  */
-NO_TRACE static size_t find_free_zone(size_t count, zone_flags_t flags,
+_NO_TRACE static size_t find_free_zone(size_t count, zone_flags_t flags,
     pfn_t constraint, size_t hint)
 {
@@ -346,5 +346,5 @@
 
 /** Return frame from zone. */
-NO_TRACE static frame_t *zone_get_frame(zone_t *zone, size_t index)
+_NO_TRACE static frame_t *zone_get_frame(zone_t *zone, size_t index)
 {
 	assert(index < zone->count);
@@ -366,5 +366,5 @@
  *
  */
-NO_TRACE static size_t zone_frame_alloc(zone_t *zone, size_t count,
+_NO_TRACE static size_t zone_frame_alloc(zone_t *zone, size_t count,
     pfn_t constraint)
 {
@@ -405,5 +405,5 @@
  *
  */
-NO_TRACE static size_t zone_frame_free(zone_t *zone, size_t index)
+_NO_TRACE static size_t zone_frame_free(zone_t *zone, size_t index)
 {
 	assert(zone->flags & ZONE_AVAILABLE);
@@ -427,5 +427,5 @@
 
 /** Mark frame in zone unavailable to allocation. */
-NO_TRACE static void zone_mark_unavailable(zone_t *zone, size_t index)
+_NO_TRACE static void zone_mark_unavailable(zone_t *zone, size_t index)
 {
 	assert(zone->flags & ZONE_AVAILABLE);
@@ -453,5 +453,5 @@
  *
  */
-NO_TRACE static void zone_merge_internal(size_t z1, size_t z2, zone_t *old_z1,
+_NO_TRACE static void zone_merge_internal(size_t z1, size_t z2, zone_t *old_z1,
     void *confdata)
 {
@@ -507,5 +507,5 @@
  *
  */
-NO_TRACE static void return_config_frames(size_t znum, pfn_t pfn, size_t count)
+_NO_TRACE static void return_config_frames(size_t znum, pfn_t pfn, size_t count)
 {
 	assert(zones.info[znum].flags & ZONE_AVAILABLE);
@@ -623,5 +623,5 @@
  *
  */
-NO_TRACE static void zone_construct(zone_t *zone, pfn_t start, size_t count,
+_NO_TRACE static void zone_construct(zone_t *zone, pfn_t start, size_t count,
     zone_flags_t flags, void *confdata)
 {
@@ -1037,5 +1037,5 @@
  *
  */
-NO_TRACE void frame_reference_add(pfn_t pfn)
+_NO_TRACE void frame_reference_add(pfn_t pfn)
 {
 	irq_spinlock_lock(&zones.lock, true);
@@ -1056,5 +1056,5 @@
  *
  */
-NO_TRACE void frame_mark_unavailable(pfn_t start, size_t count)
+_NO_TRACE void frame_mark_unavailable(pfn_t start, size_t count)
 {
 	irq_spinlock_lock(&zones.lock, true);
Index: kernel/generic/src/mm/page.c
===================================================================
--- kernel/generic/src/mm/page.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/mm/page.c	(revision 43dd2d4bd224eef76be6ddfb6d7228a2edf11ec2)
@@ -95,5 +95,5 @@
  *
  */
-NO_TRACE void page_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame,
+_NO_TRACE void page_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame,
     unsigned int flags)
 {
@@ -120,5 +120,5 @@
  *
  */
-NO_TRACE void page_mapping_remove(as_t *as, uintptr_t page)
+_NO_TRACE void page_mapping_remove(as_t *as, uintptr_t page)
 {
 	assert(page_table_locked(as));
@@ -144,5 +144,5 @@
  *         the PTE is not guaranteed to be present.
  */
-NO_TRACE bool page_mapping_find(as_t *as, uintptr_t page, bool nolock,
+_NO_TRACE bool page_mapping_find(as_t *as, uintptr_t page, bool nolock,
     pte_t *pte)
 {
@@ -165,5 +165,5 @@
  * @param pte      New PTE.
  */
-NO_TRACE void page_mapping_update(as_t *as, uintptr_t page, bool nolock,
+_NO_TRACE void page_mapping_update(as_t *as, uintptr_t page, bool nolock,
     pte_t *pte)
 {
Index: kernel/generic/src/mm/slab.c
===================================================================
--- kernel/generic/src/mm/slab.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/mm/slab.c	(revision 43dd2d4bd224eef76be6ddfb6d7228a2edf11ec2)
@@ -158,5 +158,5 @@
  *
  */
-NO_TRACE static slab_t *slab_space_alloc(slab_cache_t *cache,
+_NO_TRACE static slab_t *slab_space_alloc(slab_cache_t *cache,
     unsigned int flags)
 {
@@ -206,5 +206,5 @@
  *
  */
-NO_TRACE static size_t slab_space_free(slab_cache_t *cache, slab_t *slab)
+_NO_TRACE static size_t slab_space_free(slab_cache_t *cache, slab_t *slab)
 {
 	frame_free(KA2PA(slab->start), slab->cache->frames);
@@ -218,5 +218,5 @@
 
 /** Map object to slab structure */
-NO_TRACE static slab_t *obj2slab(void *obj)
+_NO_TRACE static slab_t *obj2slab(void *obj)
 {
 	return (slab_t *) frame_get_parent(ADDR2PFN(KA2PA(obj)), 0);
@@ -234,5 +234,5 @@
  *
  */
-NO_TRACE static size_t slab_obj_destroy(slab_cache_t *cache, void *obj,
+_NO_TRACE static size_t slab_obj_destroy(slab_cache_t *cache, void *obj,
     slab_t *slab)
 {
@@ -276,5 +276,5 @@
  *
  */
-NO_TRACE static void *slab_obj_create(slab_cache_t *cache, unsigned int flags)
+_NO_TRACE static void *slab_obj_create(slab_cache_t *cache, unsigned int flags)
 {
 	irq_spinlock_lock(&cache->slablock, true);
@@ -332,5 +332,5 @@
  *
  */
-NO_TRACE static slab_magazine_t *get_mag_from_cache(slab_cache_t *cache,
+_NO_TRACE static slab_magazine_t *get_mag_from_cache(slab_cache_t *cache,
     bool first)
 {
@@ -357,5 +357,5 @@
  *
  */
-NO_TRACE static void put_mag_to_cache(slab_cache_t *cache,
+_NO_TRACE static void put_mag_to_cache(slab_cache_t *cache,
     slab_magazine_t *mag)
 {
@@ -373,5 +373,5 @@
  *
  */
-NO_TRACE static size_t magazine_destroy(slab_cache_t *cache,
+_NO_TRACE static size_t magazine_destroy(slab_cache_t *cache,
     slab_magazine_t *mag)
 {
@@ -392,5 +392,5 @@
  *
  */
-NO_TRACE static slab_magazine_t *get_full_current_mag(slab_cache_t *cache)
+_NO_TRACE static slab_magazine_t *get_full_current_mag(slab_cache_t *cache)
 {
 	slab_magazine_t *cmag = cache->mag_cache[CPU->id].current;
@@ -429,5 +429,5 @@
  *
  */
-NO_TRACE static void *magazine_obj_get(slab_cache_t *cache)
+_NO_TRACE static void *magazine_obj_get(slab_cache_t *cache)
 {
 	if (!CPU)
@@ -459,5 +459,5 @@
  *
  */
-NO_TRACE static slab_magazine_t *make_empty_current_mag(slab_cache_t *cache)
+_NO_TRACE static slab_magazine_t *make_empty_current_mag(slab_cache_t *cache)
 {
 	slab_magazine_t *cmag = cache->mag_cache[CPU->id].current;
@@ -509,5 +509,5 @@
  *
  */
-NO_TRACE static int magazine_obj_put(slab_cache_t *cache, void *obj)
+_NO_TRACE static int magazine_obj_put(slab_cache_t *cache, void *obj)
 {
 	if (!CPU)
@@ -538,5 +538,5 @@
  *
  */
-NO_TRACE static size_t comp_objects(slab_cache_t *cache)
+_NO_TRACE static size_t comp_objects(slab_cache_t *cache)
 {
 	if (cache->flags & SLAB_CACHE_SLINSIDE)
@@ -550,5 +550,5 @@
  *
  */
-NO_TRACE static size_t badness(slab_cache_t *cache)
+_NO_TRACE static size_t badness(slab_cache_t *cache)
 {
 	size_t objects = comp_objects(cache);
@@ -564,5 +564,5 @@
  *
  */
-NO_TRACE static bool make_magcache(slab_cache_t *cache)
+_NO_TRACE static bool make_magcache(slab_cache_t *cache)
 {
 	assert(_slab_initialized >= 2);
@@ -585,5 +585,5 @@
  *
  */
-NO_TRACE static void _slab_cache_create(slab_cache_t *cache, const char *name,
+_NO_TRACE static void _slab_cache_create(slab_cache_t *cache, const char *name,
     size_t size, size_t align, errno_t (*constructor)(void *obj,
     unsigned int kmflag), size_t (*destructor)(void *obj), unsigned int flags)
@@ -660,5 +660,5 @@
  *
  */
-NO_TRACE static size_t _slab_reclaim(slab_cache_t *cache, unsigned int flags)
+_NO_TRACE static size_t _slab_reclaim(slab_cache_t *cache, unsigned int flags)
 {
 	if (cache->flags & SLAB_CACHE_NOMAGAZINE)
@@ -707,5 +707,5 @@
  *
  */
-NO_TRACE static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
+_NO_TRACE static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
 {
 	if (!obj)
Index: kernel/generic/src/proc/current.c
===================================================================
--- kernel/generic/src/proc/current.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/proc/current.c	(revision 43dd2d4bd224eef76be6ddfb6d7228a2edf11ec2)
@@ -70,5 +70,5 @@
  *
  */
-NO_TRACE void current_copy(current_t *src, current_t *dst)
+_NO_TRACE void current_copy(current_t *src, current_t *dst)
 {
 	assert(src->magic == MAGIC);
Index: kernel/generic/src/sysinfo/sysinfo.c
===================================================================
--- kernel/generic/src/sysinfo/sysinfo.c	(revision d066259279e2e85ad364d7828aa3db232f394ec4)
+++ kernel/generic/src/sysinfo/sysinfo.c	(revision 43dd2d4bd224eef76be6ddfb6d7228a2edf11ec2)
@@ -62,5 +62,5 @@
  *
  */
-NO_TRACE static errno_t sysinfo_item_constructor(void *obj, unsigned int kmflag)
+_NO_TRACE static errno_t sysinfo_item_constructor(void *obj, unsigned int kmflag)
 {
 	sysinfo_item_t *item = (sysinfo_item_t *) obj;
@@ -82,5 +82,5 @@
  *
  */
-NO_TRACE static size_t sysinfo_item_destructor(void *obj)
+_NO_TRACE static size_t sysinfo_item_destructor(void *obj)
 {
 	sysinfo_item_t *item = (sysinfo_item_t *) obj;
@@ -124,5 +124,5 @@
  *
  */
-NO_TRACE static sysinfo_item_t *sysinfo_find_item(const char *name,
+_NO_TRACE static sysinfo_item_t *sysinfo_find_item(const char *name,
     sysinfo_item_t *subtree, sysinfo_return_t **ret, bool dry_run)
 {
@@ -190,5 +190,5 @@
  *
  */
-NO_TRACE static sysinfo_item_t *sysinfo_create_path(const char *name,
+_NO_TRACE static sysinfo_item_t *sysinfo_create_path(const char *name,
     sysinfo_item_t **psubtree)
 {
@@ -508,5 +508,5 @@
  *
  */
-NO_TRACE static void sysinfo_indent(size_t spaces)
+_NO_TRACE static void sysinfo_indent(size_t spaces)
 {
 	for (size_t i = 0; i < spaces; i++)
@@ -522,5 +522,5 @@
  *
  */
-NO_TRACE static void sysinfo_dump_internal(sysinfo_item_t *root, size_t spaces)
+_NO_TRACE static void sysinfo_dump_internal(sysinfo_item_t *root, size_t spaces)
 {
 	/* Walk all siblings */
@@ -622,5 +622,5 @@
  *
  */
-NO_TRACE static sysinfo_return_t sysinfo_get_item(const char *name,
+_NO_TRACE static sysinfo_return_t sysinfo_get_item(const char *name,
     sysinfo_item_t **root, bool dry_run)
 {
@@ -677,5 +677,5 @@
  *
  */
-NO_TRACE static sysinfo_return_t sysinfo_get_item_uspace(void *ptr, size_t size,
+_NO_TRACE static sysinfo_return_t sysinfo_get_item_uspace(void *ptr, size_t size,
     bool dry_run)
 {
@@ -720,5 +720,5 @@
  *
  */
-NO_TRACE static sysinfo_return_t sysinfo_get_keys(const char *name,
+_NO_TRACE static sysinfo_return_t sysinfo_get_keys(const char *name,
     sysinfo_item_t **root, bool dry_run)
 {
@@ -786,5 +786,5 @@
  *
  */
-NO_TRACE static sysinfo_return_t sysinfo_get_keys_uspace(void *ptr, size_t size,
+_NO_TRACE static sysinfo_return_t sysinfo_get_keys_uspace(void *ptr, size_t size,
     bool dry_run)
 {