From b16bb82f8b7456f05e6ae67760867334ebe6a92a Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Fri, 16 Jul 2021 10:49:07 +0200
Subject: [PATCH] dde_linux: mark lx_emul and lx_kit as legacy

* Move headers in src/include into legacy sub-directory
* Move src/lx_kit to src/lib/legacy/

Fix #4223
---
 repos/dde_linux/lib/mk/lxip.mk                |  2 +-
 .../lib/mk/spec/arm/lx_kit_setjmp.mk          |  2 +-
 .../lib/mk/spec/arm_64/lx_kit_setjmp.mk       |  2 +-
 .../lib/mk/spec/x86_32/lx_kit_setjmp.mk       |  2 +-
 repos/dde_linux/lib/mk/spec/x86_32/wifi.mk    |  2 +-
 .../lib/mk/spec/x86_64/lx_kit_setjmp.mk       |  2 +-
 repos/dde_linux/lib/mk/spec/x86_64/wifi.mk    |  2 +-
 repos/dde_linux/lib/mk/wifi.inc               |  2 +-
 .../recipes/src/fec_nic_drv/content.mk        |  3 +-
 .../recipes/src/imx8_fb_drv/content.mk        |  3 +-
 .../recipes/src/intel_fb_drv/content.mk       |  3 +-
 .../recipes/src/usb_hid_drv/content.mk        |  3 +-
 .../recipes/src/usb_host_drv/content.mk       |  3 +-
 .../recipes/src/usb_modem_drv/content.mk      |  7 ++-
 .../recipes/src/usb_net_drv/content.mk        |  7 ++-
 .../dde_linux/recipes/src/vfs_lxip/content.mk |  5 +-
 .../dde_linux/recipes/src/wifi_drv/content.mk |  4 +-
 .../framebuffer/imx8/include/lx_emul.h        | 60 +++++++++---------
 .../framebuffer/imx8/include/lx_emul_c.h      |  4 +-
 .../src/drivers/framebuffer/imx8/lx_emul.cc   | 32 +++++-----
 .../src/drivers/framebuffer/imx8/main.cc      | 12 ++--
 .../src/drivers/framebuffer/imx8/platform.cc  |  4 +-
 .../src/drivers/framebuffer/imx8/target.mk    |  2 +-
 .../framebuffer/intel/include/lx_emul.h       | 62 +++++++++----------
 .../framebuffer/intel/include/lx_emul_c.h     |  4 +-
 .../src/drivers/framebuffer/intel/lx_emul.cc  | 32 +++++-----
 .../src/drivers/framebuffer/intel/main.cc     | 16 ++---
 .../src/drivers/framebuffer/intel/target.mk   |  2 +-
 .../dde_linux/src/drivers/nic/fec/lx_emul.cc  | 24 +++----
 repos/dde_linux/src/drivers/nic/fec/lx_emul.h | 56 ++++++++---------
 repos/dde_linux/src/drivers/nic/fec/main.cc   | 14 ++---
 .../dde_linux/src/drivers/nic/fec/platform.cc |  4 +-
 .../dde_linux/src/drivers/nic/fec/target.inc  |  2 +-
 .../drivers/nic/linux_network_session_base.cc |  2 +-
 .../drivers/nic/linux_network_session_base.h  |  2 +-
 repos/dde_linux/src/drivers/usb_hid/driver.h  |  2 +-
 repos/dde_linux/src/drivers/usb_hid/evdev.cc  |  8 +--
 .../dde_linux/src/drivers/usb_hid/lx_emul.cc  | 26 ++++----
 repos/dde_linux/src/drivers/usb_hid/lx_emul.h | 46 +++++++-------
 repos/dde_linux/src/drivers/usb_hid/main.cc   | 12 ++--
 repos/dde_linux/src/drivers/usb_hid/target.mk |  2 +-
 .../dde_linux/src/drivers/usb_host/lx_emul.cc | 24 +++----
 .../dde_linux/src/drivers/usb_host/lx_emul.h  | 60 +++++++++---------
 repos/dde_linux/src/drivers/usb_host/main.cc  | 14 ++---
 .../dde_linux/src/drivers/usb_host/platform.h |  2 +-
 repos/dde_linux/src/drivers/usb_host/raw.cc   |  8 +--
 .../src/drivers/usb_host/spec/arm/platform.cc |  6 +-
 .../src/drivers/usb_host/spec/x86/platform.cc | 14 ++---
 .../dde_linux/src/drivers/usb_host/target.inc |  2 +-
 .../dde_linux/src/drivers/usb_modem/driver.h  |  6 +-
 .../src/drivers/usb_modem/fec_nic.cc          |  2 +-
 .../dde_linux/src/drivers/usb_modem/fec_nic.h |  2 +-
 .../src/drivers/usb_modem/lx_emul.cc          | 32 +++++-----
 .../dde_linux/src/drivers/usb_modem/lx_emul.h | 52 ++++++++--------
 repos/dde_linux/src/drivers/usb_modem/main.cc | 10 +--
 .../dde_linux/src/drivers/usb_modem/target.mk |  2 +-
 .../src/drivers/usb_modem/terminal.cc         |  4 +-
 .../src/drivers/usb_modem/terminal.h          |  2 +-
 repos/dde_linux/src/drivers/usb_net/driver.h  |  2 +-
 .../dde_linux/src/drivers/usb_net/lx_emul.cc  | 32 +++++-----
 repos/dde_linux/src/drivers/usb_net/lx_emul.h | 52 ++++++++--------
 repos/dde_linux/src/drivers/usb_net/main.cc   | 14 ++---
 repos/dde_linux/src/drivers/usb_net/target.mk |  2 +-
 .../src/include/{ => legacy}/lx_emul/atomic.h |  0
 .../src/include/{ => legacy}/lx_emul/bitops.h |  0
 .../src/include/{ => legacy}/lx_emul/bug.h    |  0
 .../include/{ => legacy}/lx_emul/byteorder.h  |  0
 .../include/{ => legacy}/lx_emul/compiler.h   |  0
 .../include/{ => legacy}/lx_emul/completion.h |  0
 .../src/include/{ => legacy}/lx_emul/errno.h  |  0
 .../{ => legacy}/lx_emul/extern_c_begin.h     |  0
 .../{ => legacy}/lx_emul/extern_c_end.h       |  0
 .../src/include/{ => legacy}/lx_emul/gfp.h    |  0
 .../{ => legacy}/lx_emul/impl/completion.h    |  4 +-
 .../include/{ => legacy}/lx_emul/impl/delay.h |  4 +-
 .../include/{ => legacy}/lx_emul/impl/gfp.h   |  8 +--
 .../include/{ => legacy}/lx_emul/impl/io.h    |  4 +-
 .../{ => legacy}/lx_emul/impl/kernel.h        |  0
 .../include/{ => legacy}/lx_emul/impl/mutex.h |  4 +-
 .../include/{ => legacy}/lx_emul/impl/pci.h   |  8 +--
 .../{ => legacy}/lx_emul/impl/pci_resource.h  |  4 +-
 .../include/{ => legacy}/lx_emul/impl/sched.h |  2 +-
 .../include/{ => legacy}/lx_emul/impl/slab.h  |  2 +-
 .../{ => legacy}/lx_emul/impl/spinlock.h      |  0
 .../include/{ => legacy}/lx_emul/impl/timer.h |  2 +-
 .../include/{ => legacy}/lx_emul/impl/usb.h   |  2 +-
 .../include/{ => legacy}/lx_emul/impl/wait.h  |  2 +-
 .../include/{ => legacy}/lx_emul/impl/work.h  |  4 +-
 .../src/include/{ => legacy}/lx_emul/ioport.h |  0
 .../src/include/{ => legacy}/lx_emul/irq.h    |  0
 .../include/{ => legacy}/lx_emul/jiffies.h    |  0
 .../src/include/{ => legacy}/lx_emul/kernel.h |  0
 .../include/{ => legacy}/lx_emul/kobject.h    |  0
 .../src/include/{ => legacy}/lx_emul/list.h   |  0
 .../src/include/{ => legacy}/lx_emul/mmio.h   |  0
 .../src/include/{ => legacy}/lx_emul/module.h |  0
 .../src/include/{ => legacy}/lx_emul/mutex.h  |  0
 .../src/include/{ => legacy}/lx_emul/pci.h    |  0
 .../src/include/{ => legacy}/lx_emul/pm.h     |  0
 .../src/include/{ => legacy}/lx_emul/printf.h |  0
 .../{ => legacy}/lx_emul/scatterlist.h        |  0
 .../include/{ => legacy}/lx_emul/semaphore.h  |  0
 .../include/{ => legacy}/lx_emul/spinlock.h   |  0
 .../src/include/{ => legacy}/lx_emul/string.h |  0
 .../src/include/{ => legacy}/lx_emul/time.h   |  0
 .../src/include/{ => legacy}/lx_emul/timer.h  |  0
 .../src/include/{ => legacy}/lx_emul/types.h  |  0
 .../src/include/{ => legacy}/lx_emul/work.h   |  0
 .../lx_kit/addr_to_page_mapping.h             |  4 +-
 .../{ => legacy}/lx_kit/backend_alloc.h       |  2 +-
 .../src/include/{ => legacy}/lx_kit/env.h     |  0
 .../{ => legacy}/lx_kit/internal/io_port.h    |  0
 .../{ => legacy}/lx_kit/internal/list.h       |  0
 .../{ => legacy}/lx_kit/internal/pci_dev.h    |  4 +-
 .../{ => legacy}/lx_kit/internal/slab_alloc.h |  4 +-
 .../lx_kit/internal/slab_backend_alloc.h      |  2 +-
 .../{ => legacy}/lx_kit/internal/task.h       |  4 +-
 .../src/include/{ => legacy}/lx_kit/irq.h     |  0
 .../src/include/{ => legacy}/lx_kit/malloc.h  |  6 +-
 .../{ => legacy}/lx_kit/mapped_io_mem_range.h |  2 +-
 .../src/include/{ => legacy}/lx_kit/pci.h     |  0
 .../{ => legacy}/lx_kit/pci_dev_registry.h    |  4 +-
 .../include/{ => legacy}/lx_kit/scheduler.h   |  2 +-
 .../src/include/{ => legacy}/lx_kit/timer.h   |  0
 .../src/include/{ => legacy}/lx_kit/types.h   |  0
 .../src/include/{ => legacy}/lx_kit/usb.h     |  0
 .../src/include/{ => legacy}/lx_kit/work.h    |  0
 .../lx_kit/internal/arch_execute.h            |  0
 .../arm_64/{ => legacy}/lx_emul/barrier.h     |  0
 .../lx_kit/internal/arch_execute.h            |  0
 .../arm_v6/{ => legacy}/lx_emul/barrier.h     |  0
 .../arm_v7/{ => legacy}/lx_emul/barrier.h     |  0
 .../spec/x86/{ => legacy}/lx_emul/barrier.h   |  0
 .../lx_kit/internal/arch_execute.h            |  0
 .../lx_kit/internal/arch_execute.h            |  0
 .../src/{ => lib/legacy}/lx_kit/bug.cc        |  6 +-
 .../src/{ => lib/legacy}/lx_kit/env.cc        |  2 +-
 .../src/{ => lib/legacy}/lx_kit/irq.cc        |  4 +-
 .../src/{ => lib/legacy}/lx_kit/malloc.cc     |  6 +-
 .../legacy}/lx_kit/mapped_io_mem_range.cc     | 10 +--
 .../src/{ => lib/legacy}/lx_kit/pci.cc        |  4 +-
 .../src/{ => lib/legacy}/lx_kit/printf.cc     |  0
 .../src/{ => lib/legacy}/lx_kit/scheduler.cc  |  4 +-
 .../{ => lib/legacy}/lx_kit/spec/arm/setjmp.S |  0
 .../legacy}/lx_kit/spec/arm_64/setjmp.S       |  0
 .../legacy}/lx_kit/spec/x86_32/setjmp.S       |  0
 .../legacy}/lx_kit/spec/x86_64/setjmp.S       |  0
 .../src/{ => lib/legacy}/lx_kit/timer.cc      |  6 +-
 .../src/{ => lib/legacy}/lx_kit/work.cc       |  6 +-
 .../dde_linux/src/lib/lxip/include/lx_emul.h  | 44 ++++++-------
 repos/dde_linux/src/lib/lxip/include/msghdr.h |  4 +-
 repos/dde_linux/src/lib/lxip/lxcc_emul.cc     |  6 +-
 repos/dde_linux/src/lib/lxip/timer_handler.cc |  2 +-
 repos/dde_linux/src/lib/vfs/lxip/vfs.cc       |  8 +--
 repos/dde_linux/src/lib/wifi/firmware.cc      |  2 +-
 .../dde_linux/src/lib/wifi/include/lx_emul.h  | 58 ++++++++---------
 repos/dde_linux/src/lib/wifi/init.cc          | 12 ++--
 repos/dde_linux/src/lib/wifi/lx.h             |  2 +-
 repos/dde_linux/src/lib/wifi/lxcc_emul.cc     | 26 ++++----
 repos/dde_linux/src/lib/wifi/nic.cc           |  6 +-
 repos/dde_linux/src/lib/wifi/socket_call.cc   |  4 +-
 161 files changed, 575 insertions(+), 559 deletions(-)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/atomic.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/bitops.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/bug.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/byteorder.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/compiler.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/completion.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/errno.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/extern_c_begin.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/extern_c_end.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/gfp.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/impl/completion.h (97%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/impl/delay.h (95%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/impl/gfp.h (90%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/impl/io.h (92%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/impl/kernel.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/impl/mutex.h (97%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/impl/pci.h (91%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/impl/pci_resource.h (96%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/impl/sched.h (96%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/impl/slab.h (99%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/impl/spinlock.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/impl/timer.h (98%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/impl/usb.h (98%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/impl/wait.h (95%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/impl/work.h (97%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/ioport.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/irq.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/jiffies.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/kernel.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/kobject.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/list.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/mmio.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/module.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/mutex.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/pci.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/pm.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/printf.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/scatterlist.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/semaphore.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/spinlock.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/string.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/time.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/timer.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/types.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_emul/work.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/addr_to_page_mapping.h (96%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/backend_alloc.h (94%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/env.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/internal/io_port.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/internal/list.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/internal/pci_dev.h (98%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/internal/slab_alloc.h (94%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/internal/slab_backend_alloc.h (97%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/internal/task.h (98%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/irq.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/malloc.h (92%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/mapped_io_mem_range.h (95%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/pci.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/pci_dev_registry.h (98%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/scheduler.h (96%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/timer.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/types.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/usb.h (100%)
 rename repos/dde_linux/src/include/{ => legacy}/lx_kit/work.h (100%)
 rename repos/dde_linux/src/include/spec/arm/{ => legacy}/lx_kit/internal/arch_execute.h (100%)
 rename repos/dde_linux/src/include/spec/arm_64/{ => legacy}/lx_emul/barrier.h (100%)
 rename repos/dde_linux/src/include/spec/arm_64/{ => legacy}/lx_kit/internal/arch_execute.h (100%)
 rename repos/dde_linux/src/include/spec/arm_v6/{ => legacy}/lx_emul/barrier.h (100%)
 rename repos/dde_linux/src/include/spec/arm_v7/{ => legacy}/lx_emul/barrier.h (100%)
 rename repos/dde_linux/src/include/spec/x86/{ => legacy}/lx_emul/barrier.h (100%)
 rename repos/dde_linux/src/include/spec/x86_32/{ => legacy}/lx_kit/internal/arch_execute.h (100%)
 rename repos/dde_linux/src/include/spec/x86_64/{ => legacy}/lx_kit/internal/arch_execute.h (100%)
 rename repos/dde_linux/src/{ => lib/legacy}/lx_kit/bug.cc (77%)
 rename repos/dde_linux/src/{ => lib/legacy}/lx_kit/env.cc (93%)
 rename repos/dde_linux/src/{ => lib/legacy}/lx_kit/irq.cc (98%)
 rename repos/dde_linux/src/{ => lib/legacy}/lx_kit/malloc.cc (98%)
 rename repos/dde_linux/src/{ => lib/legacy}/lx_kit/mapped_io_mem_range.cc (95%)
 rename repos/dde_linux/src/{ => lib/legacy}/lx_kit/pci.cc (97%)
 rename repos/dde_linux/src/{ => lib/legacy}/lx_kit/printf.cc (100%)
 rename repos/dde_linux/src/{ => lib/legacy}/lx_kit/scheduler.cc (98%)
 rename repos/dde_linux/src/{ => lib/legacy}/lx_kit/spec/arm/setjmp.S (100%)
 rename repos/dde_linux/src/{ => lib/legacy}/lx_kit/spec/arm_64/setjmp.S (100%)
 rename repos/dde_linux/src/{ => lib/legacy}/lx_kit/spec/x86_32/setjmp.S (100%)
 rename repos/dde_linux/src/{ => lib/legacy}/lx_kit/spec/x86_64/setjmp.S (100%)
 rename repos/dde_linux/src/{ => lib/legacy}/lx_kit/timer.cc (98%)
 rename repos/dde_linux/src/{ => lib/legacy}/lx_kit/work.cc (97%)

diff --git a/repos/dde_linux/lib/mk/lxip.mk b/repos/dde_linux/lib/mk/lxip.mk
index f9f8ad2a4a..846d6fb7cd 100644
--- a/repos/dde_linux/lib/mk/lxip.mk
+++ b/repos/dde_linux/lib/mk/lxip.mk
@@ -49,6 +49,6 @@ net/ethernet/eth.o: SETUP_SUFFIX="_eth"
 vpath %.c $(LX_CONTRIB_DIR)
 vpath %.c $(LIB_DIR)
 vpath %.cc $(LIB_DIR)
-vpath %.cc $(REP_DIR)/src/lx_kit
+vpath %.cc $(REP_DIR)/src/lib/legacy/lx_kit
 
 CC_CXX_WARN_STRICT =
diff --git a/repos/dde_linux/lib/mk/spec/arm/lx_kit_setjmp.mk b/repos/dde_linux/lib/mk/spec/arm/lx_kit_setjmp.mk
index c9fb3bf8e4..1d6a0ec7de 100644
--- a/repos/dde_linux/lib/mk/spec/arm/lx_kit_setjmp.mk
+++ b/repos/dde_linux/lib/mk/spec/arm/lx_kit_setjmp.mk
@@ -1,5 +1,5 @@
 SRC_S += setjmp.S
 
-vpath %.S  $(REP_DIR)/src/lx_kit/spec/arm
+vpath %.S  $(REP_DIR)/src/lib/legacy/lx_kit/spec/arm
 
 CC_CXX_WARN_STRICT =
diff --git a/repos/dde_linux/lib/mk/spec/arm_64/lx_kit_setjmp.mk b/repos/dde_linux/lib/mk/spec/arm_64/lx_kit_setjmp.mk
index 327820734f..6ff2446e41 100644
--- a/repos/dde_linux/lib/mk/spec/arm_64/lx_kit_setjmp.mk
+++ b/repos/dde_linux/lib/mk/spec/arm_64/lx_kit_setjmp.mk
@@ -1,5 +1,5 @@
 SRC_S += setjmp.S
 
-vpath %.S  $(REP_DIR)/src/lx_kit/spec/arm_64
+vpath %.S  $(REP_DIR)/src/lib/legacy/lx_kit/spec/arm_64
 
 CC_CXX_WARN_STRICT =
diff --git a/repos/dde_linux/lib/mk/spec/x86_32/lx_kit_setjmp.mk b/repos/dde_linux/lib/mk/spec/x86_32/lx_kit_setjmp.mk
index ae52182cf2..68e47db968 100644
--- a/repos/dde_linux/lib/mk/spec/x86_32/lx_kit_setjmp.mk
+++ b/repos/dde_linux/lib/mk/spec/x86_32/lx_kit_setjmp.mk
@@ -1,5 +1,5 @@
 SRC_S += setjmp.S
 
-vpath %.S  $(REP_DIR)/src/lx_kit/spec/x86_32
+vpath %.S  $(REP_DIR)/src/lib/legacy/lx_kit/spec/x86_32
 
 CC_CXX_WARN_STRICT =
diff --git a/repos/dde_linux/lib/mk/spec/x86_32/wifi.mk b/repos/dde_linux/lib/mk/spec/x86_32/wifi.mk
index db9638742d..dcc582c9c3 100644
--- a/repos/dde_linux/lib/mk/spec/x86_32/wifi.mk
+++ b/repos/dde_linux/lib/mk/spec/x86_32/wifi.mk
@@ -4,6 +4,6 @@ INC_DIR += $(LIB_INC_DIR)/spec/32bit $(LIB_INC_DIR)/spec/x86_32 $(LIB_INC_DIR)/s
 
 CC_OPT += -DCONFIG_64BIT=0
 
-vpath %.S  $(REP_DIR)/src/lx_kit/spec/x86_32
+vpath %.S  $(REP_DIR)/src/lib/legacy/lx_kit/spec/x86_32
 
 CC_CXX_WARN_STRICT =
diff --git a/repos/dde_linux/lib/mk/spec/x86_64/lx_kit_setjmp.mk b/repos/dde_linux/lib/mk/spec/x86_64/lx_kit_setjmp.mk
index 3f49bf7bf7..7ef1893e68 100644
--- a/repos/dde_linux/lib/mk/spec/x86_64/lx_kit_setjmp.mk
+++ b/repos/dde_linux/lib/mk/spec/x86_64/lx_kit_setjmp.mk
@@ -1,5 +1,5 @@
 SRC_S += setjmp.S
 
-vpath %.S  $(REP_DIR)/src/lx_kit/spec/x86_64
+vpath %.S  $(REP_DIR)/src/lib/legacy/lx_kit/spec/x86_64
 
 CC_CXX_WARN_STRICT =
diff --git a/repos/dde_linux/lib/mk/spec/x86_64/wifi.mk b/repos/dde_linux/lib/mk/spec/x86_64/wifi.mk
index afbd8b5708..5daf3e03af 100644
--- a/repos/dde_linux/lib/mk/spec/x86_64/wifi.mk
+++ b/repos/dde_linux/lib/mk/spec/x86_64/wifi.mk
@@ -4,6 +4,6 @@ INC_DIR += $(LIB_INC_DIR)/spec/64bit $(LIB_INC_DIR)/spec/x86_64 $(LIB_INC_DIR)/s
 
 CC_OPT += -DCONFIG_64BIT=1
 
-vpath %.S  $(REP_DIR)/src/lx_kit/spec/x86_64
+vpath %.S  $(REP_DIR)/src/lib/legacy/lx_kit/spec/x86_64
 
 CC_CXX_WARN_STRICT =
diff --git a/repos/dde_linux/lib/mk/wifi.inc b/repos/dde_linux/lib/mk/wifi.inc
index cc7337386e..0f6e87f11b 100644
--- a/repos/dde_linux/lib/mk/wifi.inc
+++ b/repos/dde_linux/lib/mk/wifi.inc
@@ -129,6 +129,6 @@ vpath %.c  $(WIFI_DIR)
 vpath %.c  $(WIFI_CONTRIB_DIR)
 vpath %.c  $(LIB_DIR)
 vpath %.cc $(LIB_DIR)
-vpath %.cc $(REP_DIR)/src/lx_kit
+vpath %.cc $(REP_DIR)/src/lib/legacy/lx_kit
 
 # vi: set ft=make :
diff --git a/repos/dde_linux/recipes/src/fec_nic_drv/content.mk b/repos/dde_linux/recipes/src/fec_nic_drv/content.mk
index 09b87aa2bb..0844a27927 100644
--- a/repos/dde_linux/recipes/src/fec_nic_drv/content.mk
+++ b/repos/dde_linux/recipes/src/fec_nic_drv/content.mk
@@ -7,7 +7,8 @@ MIRROR_FROM_REP_DIR := $(LIB_MK) \
                        src/drivers/nic/linux_network_session_base.cc \
                        src/drivers/nic/linux_network_session_base.h \
                        lib/import/import-fec_nic_include.mk \
-                       src/include src/lx_kit \
+                       src/include/legacy src/lib/legacy/lx_kit \
+                       $(foreach SPEC,arm arm_64 arm_v7,src/include/spec/$(SPEC)/legacy) \
                        $(shell cd $(REP_DIR); find src/drivers/nic/fec -type f)
 
 MIRROR_FROM_PORT_DIR := $(shell cd $(PORT_DIR); find src/drivers/nic/fec -type f | grep -v ".git")
diff --git a/repos/dde_linux/recipes/src/imx8_fb_drv/content.mk b/repos/dde_linux/recipes/src/imx8_fb_drv/content.mk
index 52a1d1d171..94f615ed8b 100644
--- a/repos/dde_linux/recipes/src/imx8_fb_drv/content.mk
+++ b/repos/dde_linux/recipes/src/imx8_fb_drv/content.mk
@@ -6,7 +6,8 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/dde_linux)
 
 MIRROR_FROM_REP_DIR := $(LIB_MK) \
                        lib/import/import-imx8_fb_include.mk \
-                       src/include src/lx_kit \
+                       src/include/legacy src/include/spec/arm_64/legacy \
+                       src/lib/legacy/lx_kit \
                        $(shell cd $(REP_DIR); find src/drivers/framebuffer/imx8 -type f)
 
 MIRROR_FROM_PORT_DIR := $(shell cd $(PORT_DIR); find src/drivers/framebuffer/imx8 -type f | grep -v ".git")
diff --git a/repos/dde_linux/recipes/src/intel_fb_drv/content.mk b/repos/dde_linux/recipes/src/intel_fb_drv/content.mk
index fbe12878ec..a9389e1fb2 100644
--- a/repos/dde_linux/recipes/src/intel_fb_drv/content.mk
+++ b/repos/dde_linux/recipes/src/intel_fb_drv/content.mk
@@ -6,7 +6,8 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/dde_linux)
 
 MIRROR_FROM_REP_DIR := $(LIB_MK) \
                        lib/import/import-intel_fb_include.mk \
-                       src/include src/lx_kit \
+                       src/include src/lib/legacy/lx_kit \
+                       $(foreach SPEC,x86 x86_32 x86_64,src/include/spec/$(SPEC)/legacy) \
                        $(shell cd $(REP_DIR); find src/drivers/framebuffer/intel -type f)
 
 MIRROR_FROM_PORT_DIR := $(shell cd $(PORT_DIR); find src/drivers/framebuffer/intel -type f | grep -v ".git")
diff --git a/repos/dde_linux/recipes/src/usb_hid_drv/content.mk b/repos/dde_linux/recipes/src/usb_hid_drv/content.mk
index 3904d24d5c..60b1e5d77a 100644
--- a/repos/dde_linux/recipes/src/usb_hid_drv/content.mk
+++ b/repos/dde_linux/recipes/src/usb_hid_drv/content.mk
@@ -6,7 +6,8 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/dde_linux)
 MIRROR_FROM_REP_DIR := $(LIB_MK) \
                        lib/import/import-usb_hid_include.mk \
                        lib/import/import-usb_arch_include.mk \
-                       src/include src/lx_kit \
+                       src/include/legacy src/lib/legacy/lx_kit \
+                       $(foreach SPEC,arm arm_64 arm_v6 arm_v7 x86 x86_32 x86_64,src/include/spec/$(SPEC)/legacy) \
                        $(shell cd $(REP_DIR); find src/drivers/usb_hid -type f)
 
 MIRROR_FROM_PORT_DIR := $(shell cd $(PORT_DIR); find src/drivers/usb_hid -type f | grep -v ".git")
diff --git a/repos/dde_linux/recipes/src/usb_host_drv/content.mk b/repos/dde_linux/recipes/src/usb_host_drv/content.mk
index 655ba854be..b5aa036006 100644
--- a/repos/dde_linux/recipes/src/usb_host_drv/content.mk
+++ b/repos/dde_linux/recipes/src/usb_host_drv/content.mk
@@ -5,7 +5,8 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/dde_linux)
 
 MIRROR_FROM_REP_DIR := $(LIB_MK) \
                        lib/import/import-usb_host_include.mk \
-                       src/include src/lx_kit \
+                       src/include/legacy src/lib/legacy/lx_kit \
+                       $(foreach SPEC,arm arm_64 arm_v6 arm_v7 x86 x86_32 x86_64,src/include/spec/$(SPEC)/legacy) \
                        $(shell cd $(REP_DIR); find src/drivers/usb_host -type f)
 
 MIRROR_FROM_PORT_DIR := $(shell cd $(PORT_DIR); find src/drivers/usb_host -type f | grep -v ".git")
diff --git a/repos/dde_linux/recipes/src/usb_modem_drv/content.mk b/repos/dde_linux/recipes/src/usb_modem_drv/content.mk
index 00ed830f4d..abc69c4c5e 100644
--- a/repos/dde_linux/recipes/src/usb_modem_drv/content.mk
+++ b/repos/dde_linux/recipes/src/usb_modem_drv/content.mk
@@ -1,11 +1,14 @@
 PORT_DIR := $(call port_dir,$(REP_DIR)/ports/dde_linux)
 
 MIRROR_FROM_REP_DIR := src/drivers/usb_modem \
-                       src/lx_kit \
-                       src/include \
+                       src/lib/legacy/lx_kit \
+                       src/include/legacy \
                        lib/import/import-usb_modem_include.mk \
                        lib/import/import-usb_arch_include.mk \
                        lib/mk/usb_modem_include.mk \
+                       $(foreach SPEC, \
+                                 arm arm_64 arm_v6 arm_v7 x86 x86_32 x86_64, \
+                                 src/include/spec/$(SPEC)/legacy) \
                        $(foreach SPEC, \
                                  arm arm_64 x86_32 x86_64, \
                                  lib/mk/spec/$(SPEC)/lx_kit_setjmp.mk)
diff --git a/repos/dde_linux/recipes/src/usb_net_drv/content.mk b/repos/dde_linux/recipes/src/usb_net_drv/content.mk
index 2ee110a979..dabba561f4 100644
--- a/repos/dde_linux/recipes/src/usb_net_drv/content.mk
+++ b/repos/dde_linux/recipes/src/usb_net_drv/content.mk
@@ -3,11 +3,14 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/dde_linux)
 MIRROR_FROM_REP_DIR := src/drivers/usb_net \
                        src/drivers/nic/linux_network_session_base.cc \
                        src/drivers/nic/linux_network_session_base.h \
-                       src/lx_kit \
-                       src/include \
+                       src/lib/legacy/lx_kit \
+                       src/include/legacy \
                        lib/import/import-usb_net_include.mk \
                        lib/import/import-usb_arch_include.mk \
                        lib/mk/usb_net_include.mk \
+                       $(foreach SPEC, \
+                                 arm arm_64 arm_v6 arm_v7 x86 x86_32 x86_64, \
+                                 src/include/spec/$(SPEC)/legacy) \
                        $(foreach SPEC, \
                                  arm arm_64 x86_32 x86_64, \
                                  lib/mk/spec/$(SPEC)/lx_kit_setjmp.mk)
diff --git a/repos/dde_linux/recipes/src/vfs_lxip/content.mk b/repos/dde_linux/recipes/src/vfs_lxip/content.mk
index a656ea1680..ccdc0e0565 100644
--- a/repos/dde_linux/recipes/src/vfs_lxip/content.mk
+++ b/repos/dde_linux/recipes/src/vfs_lxip/content.mk
@@ -5,7 +5,10 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/dde_linux)
 
 MIRROR_FROM_REP_DIR := $(LIB_MK) \
                        lib/import/import-lxip_include.mk \
-                       include/lxip src/include src/lx_kit \
+                       include/lxip src/include/legacy src/lib/legacy/lx_kit \
+                       $(foreach SPEC, \
+                                 arm arm_64 arm_v6 arm_v7 x86 x86_32 x86_64, \
+                                 src/include/spec/$(SPEC)/legacy) \
                        $(shell cd $(REP_DIR); find src/lib/lxip -type f) \
                        $(shell cd $(REP_DIR); find src/lib/vfs -type f)
 
diff --git a/repos/dde_linux/recipes/src/wifi_drv/content.mk b/repos/dde_linux/recipes/src/wifi_drv/content.mk
index 4221eec416..6632ce979d 100644
--- a/repos/dde_linux/recipes/src/wifi_drv/content.mk
+++ b/repos/dde_linux/recipes/src/wifi_drv/content.mk
@@ -11,7 +11,9 @@ MIRROR_FROM_REP_DIR := $(LIB_MK) \
                        lib/import/import-wifi_include.mk \
                        lib/import/import-libnl_include.mk \
                        lib/import/import-libnl.mk \
-                       include/wifi src/include src/lx_kit \
+                       include/wifi src/include/legacy src/lib/legacy/lx_kit \
+                       $(foreach SPEC, x86 x86_32 x86_64, \
+                                 src/include/spec/$(SPEC)/legacy) \
                        $(shell cd $(REP_DIR); find src/drivers/wifi -type f) \
                        $(shell cd $(REP_DIR); find src/lib/libnl -type f) \
                        $(shell cd $(REP_DIR); find src/lib/wifi -type f) \
diff --git a/repos/dde_linux/src/drivers/framebuffer/imx8/include/lx_emul.h b/repos/dde_linux/src/drivers/framebuffer/imx8/include/lx_emul.h
index f11a661715..8abedcfa3d 100644
--- a/repos/dde_linux/src/drivers/framebuffer/imx8/include/lx_emul.h
+++ b/repos/dde_linux/src/drivers/framebuffer/imx8/include/lx_emul.h
@@ -19,15 +19,15 @@
 #include <stdarg.h>
 #include <base/fixed_stdint.h>
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 
-#include <lx_emul/irq.h>      /* dependency of lx_kit/irq.h */
+#include <legacy/lx_emul/irq.h>      /* dependency of lx_kit/irq.h */
 
-#include <lx_emul/atomic.h>   /* dependency of lx_emul/work.h */
-#include <lx_emul/compiler.h> /* dependency of lx_emul/kernel.h */
-#include <lx_emul/printf.h>   /* dependency of lx_emul/kernel.h */
-#include <lx_emul/kernel.h>   /* dependency of lx_emul/jiffies.h */
-#include <lx_emul/types.h>    /* dependency of lx_emul/jiffies.h */
+#include <legacy/lx_emul/atomic.h>   /* dependency of lx_emul/work.h */
+#include <legacy/lx_emul/compiler.h> /* dependency of lx_emul/kernel.h */
+#include <legacy/lx_emul/printf.h>   /* dependency of lx_emul/kernel.h */
+#include <legacy/lx_emul/kernel.h>   /* dependency of lx_emul/jiffies.h */
+#include <legacy/lx_emul/types.h>    /* dependency of lx_emul/jiffies.h */
 
 /*****************
  ** asm/param.h **
@@ -36,8 +36,8 @@
 enum { HZ = 100UL };          /* dependency of lx_emul/jiffies.h */
 
 
-#include <lx_emul/jiffies.h>  /* dependency of lx_emul/time.h */
-#include <lx_emul/time.h>     /* dependency of lx_emul/timer.h */
+#include <legacy/lx_emul/jiffies.h>  /* dependency of lx_emul/time.h */
+#include <legacy/lx_emul/time.h>     /* dependency of lx_emul/timer.h */
 
 
 /*******************
@@ -54,8 +54,8 @@ struct timer_list;
 void setup_timer(struct timer_list *timer, void (*function)(unsigned long),
                  unsigned long data);
 
-#include <lx_emul/timer.h>    /* dependency of lx_emul/work.h */
-#include <lx_emul/bitops.h>   /* dependency of lx_emul/work.h */
+#include <legacy/lx_emul/timer.h>    /* dependency of lx_emul/work.h */
+#include <legacy/lx_emul/bitops.h>   /* dependency of lx_emul/work.h */
 
 
 /***********************
@@ -86,22 +86,22 @@ int devm_request_threaded_irq(struct device *dev, unsigned int irq,
 			      unsigned long irqflags, const char *devname,
 			      void *dev_id);
 
-#include <lx_emul/spinlock.h> /* dependency of lx_emul/work.h */
-#include <lx_emul/work.h>     /* dependency of lx_kit/work.h */
+#include <legacy/lx_emul/spinlock.h> /* dependency of lx_emul/work.h */
+#include <legacy/lx_emul/work.h>     /* dependency of lx_kit/work.h */
 
-#include <lx_emul/mutex.h>    /* dependency of lx_emul/kobject.h */
-#include <lx_emul/kobject.h>
-#include <lx_emul/completion.h>
-#include <lx_emul/errno.h>
-#include <lx_emul/barrier.h>
-#include <lx_emul/bug.h>
-#include <lx_emul/gfp.h>
-#include <lx_emul/ioport.h>
-#include <lx_emul/module.h>
-#include <lx_emul/pm.h>
-#include <lx_emul/scatterlist.h>
-#include <lx_emul/semaphore.h>
-#include <lx_emul/string.h>
+#include <legacy/lx_emul/mutex.h>    /* dependency of lx_emul/kobject.h */
+#include <legacy/lx_emul/kobject.h>
+#include <legacy/lx_emul/completion.h>
+#include <legacy/lx_emul/errno.h>
+#include <legacy/lx_emul/barrier.h>
+#include <legacy/lx_emul/bug.h>
+#include <legacy/lx_emul/gfp.h>
+#include <legacy/lx_emul/ioport.h>
+#include <legacy/lx_emul/module.h>
+#include <legacy/lx_emul/pm.h>
+#include <legacy/lx_emul/scatterlist.h>
+#include <legacy/lx_emul/semaphore.h>
+#include <legacy/lx_emul/string.h>
 
 LX_MUTEX_INIT_DECLARE(component_mutex);
 #define component_mutex LX_MUTEX(component_mutex)
@@ -111,7 +111,7 @@ LX_MUTEX_INIT_DECLARE(component_mutex);
  ** asm-generic/io.h **
  **********************/
 
-#include <lx_emul/mmio.h>
+#include <legacy/lx_emul/mmio.h>
 
 
 static inline u32 __raw_readl(const volatile void __iomem *addr)
@@ -298,7 +298,7 @@ static inline void __read_once_size(const volatile void *p, void *res, int size)
 })
 #endif
 
-#include <lx_emul/list.h>
+#include <legacy/lx_emul/list.h>
 
 #define ULLONG_MAX	(~0ULL)
 #define SIZE_MAX (~(size_t)0)
@@ -630,7 +630,7 @@ static inline void kmemleak_update_trace(const void *ptr) { }
  ** linux/byteorder/ **
  **********************/
 
-#include <lx_emul/byteorder.h>
+#include <legacy/lx_emul/byteorder.h>
 
 /******************
  ** linux/swab.h **
@@ -1965,6 +1965,6 @@ LX_MUTEX_INIT_DECLARE(host_lock);
 
 #define host_lock LX_MUTEX(host_lock)
 
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 #endif /* _LX_EMUL_H_ */
diff --git a/repos/dde_linux/src/drivers/framebuffer/imx8/include/lx_emul_c.h b/repos/dde_linux/src/drivers/framebuffer/imx8/include/lx_emul_c.h
index 35812df15d..89776c1276 100644
--- a/repos/dde_linux/src/drivers/framebuffer/imx8/include/lx_emul_c.h
+++ b/repos/dde_linux/src/drivers/framebuffer/imx8/include/lx_emul_c.h
@@ -31,7 +31,7 @@
 		} \
 	} while (0)
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 
 struct drm_device;
 struct drm_framebuffer;
@@ -57,6 +57,6 @@ void   lx_c_set_mode(struct drm_device *, struct drm_connector *,
 void   lx_c_set_driver(struct drm_device *, void *);
 void * lx_c_get_driver(struct drm_device *);
 
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 #endif /* _LX_EMUL_C_H_ */
diff --git a/repos/dde_linux/src/drivers/framebuffer/imx8/lx_emul.cc b/repos/dde_linux/src/drivers/framebuffer/imx8/lx_emul.cc
index 039409d6c9..fdae25c033 100644
--- a/repos/dde_linux/src/drivers/framebuffer/imx8/lx_emul.cc
+++ b/repos/dde_linux/src/drivers/framebuffer/imx8/lx_emul.cc
@@ -24,7 +24,7 @@
 #include <lx_emul_c.h>
 
 /* DRM-specific includes */
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 #include <drm/drmP.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_gem_cma_helper.h>
@@ -36,24 +36,24 @@
 #include <linux/component.h>
 #include <linux/phy/phy.h>
 #include <video/videomode.h>
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
-#include <lx_kit/scheduler.h> /* dependency of lx_emul/impl/completion.h */
+#include <legacy/lx_kit/scheduler.h> /* dependency of lx_emul/impl/completion.h */
 
-#include <lx_emul/impl/completion.h>
-#include <lx_emul/impl/delay.h>
-#include <lx_emul/impl/gfp.h>
-#include <lx_emul/impl/kernel.h>
-#include <lx_emul/impl/mutex.h>
-#include <lx_emul/impl/sched.h>
-#include <lx_emul/impl/slab.h>
-#include <lx_emul/impl/spinlock.h>
-#include <lx_emul/impl/timer.h>
-#include <lx_emul/impl/wait.h> /* dependency of lx_emul/impl/work.h */
-#include <lx_emul/impl/work.h>
+#include <legacy/lx_emul/impl/completion.h>
+#include <legacy/lx_emul/impl/delay.h>
+#include <legacy/lx_emul/impl/gfp.h>
+#include <legacy/lx_emul/impl/kernel.h>
+#include <legacy/lx_emul/impl/mutex.h>
+#include <legacy/lx_emul/impl/sched.h>
+#include <legacy/lx_emul/impl/slab.h>
+#include <legacy/lx_emul/impl/spinlock.h>
+#include <legacy/lx_emul/impl/timer.h>
+#include <legacy/lx_emul/impl/wait.h> /* dependency of lx_emul/impl/work.h */
+#include <legacy/lx_emul/impl/work.h>
 
-#include <lx_kit/irq.h>
-#include <lx_kit/malloc.h>
+#include <legacy/lx_kit/irq.h>
+#include <legacy/lx_kit/malloc.h>
 
 enum Device_id { DCSS, HDMI, MIPI, SRC, UNKNOWN };
 
diff --git a/repos/dde_linux/src/drivers/framebuffer/imx8/main.cc b/repos/dde_linux/src/drivers/framebuffer/imx8/main.cc
index 8f43b20450..bc819c8e3d 100644
--- a/repos/dde_linux/src/drivers/framebuffer/imx8/main.cc
+++ b/repos/dde_linux/src/drivers/framebuffer/imx8/main.cc
@@ -25,12 +25,12 @@
 
 /* Linux emulation environment includes */
 #include <lx_emul.h>
-#include <lx_kit/env.h>
-#include <lx_kit/malloc.h>
-#include <lx_kit/scheduler.h>
-#include <lx_kit/timer.h>
-#include <lx_kit/irq.h>
-#include <lx_kit/work.h>
+#include <legacy/lx_kit/env.h>
+#include <legacy/lx_kit/malloc.h>
+#include <legacy/lx_kit/scheduler.h>
+#include <legacy/lx_kit/timer.h>
+#include <legacy/lx_kit/irq.h>
+#include <legacy/lx_kit/work.h>
 
 /* Linux module functions */
 extern "C" void radix_tree_init();        /* called by start_kernel(void) normally */
diff --git a/repos/dde_linux/src/drivers/framebuffer/imx8/platform.cc b/repos/dde_linux/src/drivers/framebuffer/imx8/platform.cc
index 96978f778d..ca599a4a3b 100644
--- a/repos/dde_linux/src/drivers/framebuffer/imx8/platform.cc
+++ b/repos/dde_linux/src/drivers/framebuffer/imx8/platform.cc
@@ -15,8 +15,8 @@
 
 #include <base/ram_allocator.h>
 
-#include <lx_kit/backend_alloc.h>
-#include <lx_kit/env.h>
+#include <legacy/lx_kit/backend_alloc.h>
+#include <legacy/lx_kit/env.h>
 
 
 /****************************
diff --git a/repos/dde_linux/src/drivers/framebuffer/imx8/target.mk b/repos/dde_linux/src/drivers/framebuffer/imx8/target.mk
index 2f4706bc5e..4f33faaf41 100644
--- a/repos/dde_linux/src/drivers/framebuffer/imx8/target.mk
+++ b/repos/dde_linux/src/drivers/framebuffer/imx8/target.mk
@@ -18,7 +18,7 @@ SRC_CC  += printf.cc \
 INC_DIR += $(REP_DIR)/src/include
 
 vpath %.cc $(PRG_DIR)
-vpath %.cc $(REP_DIR)/src/lx_kit
+vpath %.cc $(REP_DIR)/src/lib/legacy/lx_kit
 
 CC_CXX_WARN_STRICT =
 CC_OPT += -Wno-narrowing
diff --git a/repos/dde_linux/src/drivers/framebuffer/intel/include/lx_emul.h b/repos/dde_linux/src/drivers/framebuffer/intel/include/lx_emul.h
index 279cd5fb6d..ff4e8dd87a 100644
--- a/repos/dde_linux/src/drivers/framebuffer/intel/include/lx_emul.h
+++ b/repos/dde_linux/src/drivers/framebuffer/intel/include/lx_emul.h
@@ -13,7 +13,7 @@
 #include <stdarg.h>
 #include <base/fixed_stdint.h>
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 
 /*****************
  ** asm/param.h **
@@ -23,10 +23,10 @@ enum { HZ = 100UL };
 
 #define DEBUG_LINUX_PRINTK 0
 
-#include <lx_emul/compiler.h>
-#include <lx_emul/printf.h>
-#include <lx_emul/bug.h>
-#include <lx_emul/atomic.h>
+#include <legacy/lx_emul/compiler.h>
+#include <legacy/lx_emul/printf.h>
+#include <legacy/lx_emul/bug.h>
+#include <legacy/lx_emul/atomic.h>
 
 static inline void atomic_or(int i, atomic_t *v) {
 	v->counter = v->counter | i; }
@@ -38,8 +38,8 @@ void atomic_andnot(int, atomic_t *);
 void atomic_set_mask(unsigned int mask, atomic_t *v);
 #define atomic_set_release(v, i) atomic_set((v), (i))
 
-#include <lx_emul/barrier.h>
-#include <lx_emul/types.h>
+#include <legacy/lx_emul/barrier.h>
+#include <legacy/lx_emul/types.h>
 
 typedef unsigned long kernel_ulong_t;
 typedef unsigned int  u_int;
@@ -139,7 +139,7 @@ struct page *virt_to_page(const void *addr);
 
 dma_addr_t page_to_phys(struct page *page);
 
-#include <lx_emul/bitops.h>
+#include <legacy/lx_emul/bitops.h>
 
 extern unsigned long find_next_bit(const unsigned long *addr, unsigned long
                                    size, unsigned long offset);
@@ -168,12 +168,12 @@ extern unsigned long find_next_zero_bit(const unsigned long *addr, unsigned
 #include <asm-generic/getorder.h>
 
 
-#include <lx_emul/errno.h>
+#include <legacy/lx_emul/errno.h>
 
 /* needed by 'virt_to_phys', which is needed by agp/generic.c */
 typedef unsigned long phys_addr_t;
 
-#include <lx_emul/string.h>
+#include <legacy/lx_emul/string.h>
 
 void *memchr_inv(const void *s, int c, size_t n);
 
@@ -181,7 +181,7 @@ void *memchr_inv(const void *s, int c, size_t n);
  ** linux/compiler.h **
  **********************/
 
-#include <lx_emul/compiler.h>
+#include <legacy/lx_emul/compiler.h>
 
 #define prefetchw(x) __builtin_prefetch(x,1)
 
@@ -215,8 +215,8 @@ static inline void __read_once_size(const volatile void *p, void *res, int size)
 })
 #endif
 
-#include <lx_emul/list.h>
-#include <lx_emul/kernel.h>
+#include <legacy/lx_emul/list.h>
+#include <legacy/lx_emul/kernel.h>
 
 #define SIZE_MAX (~(size_t)0)
 #define U64_MAX  ((u64)~0ULL)
@@ -300,7 +300,7 @@ int hex_dump_to_buffer(const void *buf, size_t len,
                        char *linebuf, size_t linebuflen, bool ascii);
 
 
-#include <lx_emul/module.h>
+#include <legacy/lx_emul/module.h>
 
 #define MODULE_ALIAS_MISCDEV(x)  /* needed by agp/backend.c */
 
@@ -372,7 +372,7 @@ unsigned int kref_read(const struct kref*);
  ** linux/jiffies.h **
  *********************/
 
-#include <lx_emul/jiffies.h>
+#include <legacy/lx_emul/jiffies.h>
 
 #define time_before(a,b)	time_after(b,a)
 #define time_before_eq(a,b)	time_after_eq(b,a)
@@ -386,10 +386,10 @@ extern u64 nsecs_to_jiffies64(u64 n);
 
 static inline u64 get_jiffies_64(void) { return jiffies; }
 
-#include <lx_emul/spinlock.h>
-#include <lx_emul/semaphore.h>
+#include <legacy/lx_emul/spinlock.h>
+#include <legacy/lx_emul/semaphore.h>
 
-#include <lx_emul/mutex.h>
+#include <legacy/lx_emul/mutex.h>
 
 LX_MUTEX_INIT_DECLARE(bridge_lock);
 LX_MUTEX_INIT_DECLARE(core_lock);
@@ -440,7 +440,7 @@ struct ww_mutex {
  ** linux/time.h **
  ******************/
 
-#include <lx_emul/time.h>
+#include <legacy/lx_emul/time.h>
 
 void getrawmonotonic(struct timespec *ts);
 
@@ -457,13 +457,13 @@ s64 timespec_to_ns(const struct timespec *ts);
 
 typedef int clockid_t;
 
-#include <lx_emul/timer.h>
+#include <legacy/lx_emul/timer.h>
 
 #define del_singleshot_timer_sync(t) del_timer_sync(t)
 
 void timer_setup(struct timer_list *, void (*func)(struct timer_list *), unsigned int);
 
-#include <lx_emul/work.h>
+#include <legacy/lx_emul/work.h>
 
 extern bool flush_delayed_work(struct delayed_work *dwork);
 
@@ -576,7 +576,7 @@ int sched_setscheduler_nocheck(struct task_struct *, int, const struct sched_par
  ** linux/completion.h **
  ************************/
 
-#include <lx_emul/completion.h>
+#include <legacy/lx_emul/completion.h>
 
 struct completion {
 	unsigned done;
@@ -627,7 +627,7 @@ void usleep_range(unsigned long min, unsigned long max); /* intel_dp.c */
 
 struct scatterlist;
 
-#include <lx_emul/kobject.h>
+#include <legacy/lx_emul/kobject.h>
 
 enum kobject_action {
 	KOBJ_CHANGE,
@@ -911,7 +911,7 @@ static inline void kmemleak_free(const void *ptr) { }
  ** linux/byteorder/ **
  **********************/
 
-#include <lx_emul/byteorder.h>
+#include <legacy/lx_emul/byteorder.h>
 
 
 /******************
@@ -932,7 +932,7 @@ static inline void  kunmap_atomic(void *addr) { return; }
 struct page *kmap_to_page(void *);
 
 
-#include <lx_emul/gfp.h>
+#include <legacy/lx_emul/gfp.h>
 
 void __free_pages(struct page *page, unsigned int order);
 
@@ -1086,7 +1086,7 @@ void sysfs_remove_link(struct kobject *kobj, const char *name);
  ** linux/pm.h **
  ****************/
 
-#include <lx_emul/pm.h>
+#include <legacy/lx_emul/pm.h>
 
 enum {
 	PM_EVENT_QUIESCE = 0x0008,
@@ -1362,7 +1362,7 @@ int dma_set_coherent_mask(struct device *dev, u64 mask);
 
 #define pgprot_noncached(prot) prot
 
-#include <lx_emul/mmio.h>
+#include <legacy/lx_emul/mmio.h>
 
 
 /********************
@@ -1377,7 +1377,7 @@ unsigned long get_random_long(void);
  ** linux/ioport.h **
  ********************/
 
-#include <lx_emul/ioport.h>
+#include <legacy/lx_emul/ioport.h>
 
 extern struct resource iomem_resource;
 
@@ -1424,7 +1424,7 @@ struct pci_device_id {
 	unsigned long driver_data;
 };
 
-#include <lx_emul/pci.h>
+#include <legacy/lx_emul/pci.h>
 
 struct pci_dev *pci_get_bus_and_slot(unsigned int bus, unsigned int devfn);
 int pci_bus_alloc_resource(struct pci_bus *bus,
@@ -1504,7 +1504,7 @@ void pci_iounmap(struct pci_dev *dev, void __iomem *p);
  ** linux/irqreturn.h **
  ***********************/
 
-#include <lx_emul/irq.h>
+#include <legacy/lx_emul/irq.h>
 
 /********************
  ** linux/of_irq.h **
@@ -2727,6 +2727,6 @@ void disable_irq(unsigned int);
 
 #include <linux/math64.h>
 
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 #endif /* _LX_EMUL_H_ */
diff --git a/repos/dde_linux/src/drivers/framebuffer/intel/include/lx_emul_c.h b/repos/dde_linux/src/drivers/framebuffer/intel/include/lx_emul_c.h
index b6e0923e1e..26df089e50 100644
--- a/repos/dde_linux/src/drivers/framebuffer/intel/include/lx_emul_c.h
+++ b/repos/dde_linux/src/drivers/framebuffer/intel/include/lx_emul_c.h
@@ -31,7 +31,7 @@
 		} \
 	} while (0)
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 
 struct drm_device;
 struct drm_framebuffer;
@@ -57,6 +57,6 @@ void * lx_c_get_driver(struct drm_device *);
 void   lx_c_set_brightness(struct drm_connector *, unsigned, unsigned);
 unsigned lx_c_get_brightness(struct drm_connector * const, unsigned);
 
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 #endif /* _LX_EMUL_C_H_ */
diff --git a/repos/dde_linux/src/drivers/framebuffer/intel/lx_emul.cc b/repos/dde_linux/src/drivers/framebuffer/intel/lx_emul.cc
index ed67e70830..31d13baee1 100644
--- a/repos/dde_linux/src/drivers/framebuffer/intel/lx_emul.cc
+++ b/repos/dde_linux/src/drivers/framebuffer/intel/lx_emul.cc
@@ -24,26 +24,26 @@
 /* DRM-specific includes */
 #include <lx_emul.h>
 #include <lx_emul_c.h>
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 #include <drm/drmP.h>
 #include <drm/drm_gem.h>
 #include "drm_crtc_internal.h"
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 #include <drm/i915_drm.h>
 
-#include <lx_emul/impl/kernel.h>
-#include <lx_emul/impl/delay.h>
-#include <lx_emul/impl/slab.h>
-#include <lx_emul/impl/gfp.h>
-#include <lx_emul/impl/io.h>
-#include <lx_emul/impl/pci.h>
-#include <lx_emul/impl/work.h>
-#include <lx_emul/impl/spinlock.h>
-#include <lx_emul/impl/mutex.h>
-#include <lx_emul/impl/sched.h>
-#include <lx_emul/impl/timer.h>
-#include <lx_emul/impl/completion.h>
-#include <lx_emul/impl/wait.h>
+#include <legacy/lx_emul/impl/kernel.h>
+#include <legacy/lx_emul/impl/delay.h>
+#include <legacy/lx_emul/impl/slab.h>
+#include <legacy/lx_emul/impl/gfp.h>
+#include <legacy/lx_emul/impl/io.h>
+#include <legacy/lx_emul/impl/pci.h>
+#include <legacy/lx_emul/impl/work.h>
+#include <legacy/lx_emul/impl/spinlock.h>
+#include <legacy/lx_emul/impl/mutex.h>
+#include <legacy/lx_emul/impl/sched.h>
+#include <legacy/lx_emul/impl/timer.h>
+#include <legacy/lx_emul/impl/completion.h>
+#include <legacy/lx_emul/impl/wait.h>
 
 static struct drm_device * lx_drm_device = nullptr;
 
@@ -161,7 +161,7 @@ void Framebuffer::Driver::finish_initialization()
 }
 
 
-#include <lx_kit/irq.h>
+#include <legacy/lx_kit/irq.h>
 
 void Framebuffer::Driver::_poll()
 {
diff --git a/repos/dde_linux/src/drivers/framebuffer/intel/main.cc b/repos/dde_linux/src/drivers/framebuffer/intel/main.cc
index 7d64d7ac62..88900a0588 100644
--- a/repos/dde_linux/src/drivers/framebuffer/intel/main.cc
+++ b/repos/dde_linux/src/drivers/framebuffer/intel/main.cc
@@ -23,14 +23,14 @@
 
 /* Linux emulation environment includes */
 #include <lx_emul.h>
-#include <lx_kit/env.h>
-#include <lx_kit/malloc.h>
-#include <lx_kit/scheduler.h>
-#include <lx_kit/timer.h>
-#include <lx_kit/irq.h>
-#include <lx_kit/pci_dev_registry.h>
-#include <lx_kit/backend_alloc.h>
-#include <lx_kit/work.h>
+#include <legacy/lx_kit/env.h>
+#include <legacy/lx_kit/malloc.h>
+#include <legacy/lx_kit/scheduler.h>
+#include <legacy/lx_kit/timer.h>
+#include <legacy/lx_kit/irq.h>
+#include <legacy/lx_kit/pci_dev_registry.h>
+#include <legacy/lx_kit/backend_alloc.h>
+#include <legacy/lx_kit/work.h>
 
 /* Linux module functions */
 extern "C" void postcore_i2c_init(void);  /* i2c-core-base.c */
diff --git a/repos/dde_linux/src/drivers/framebuffer/intel/target.mk b/repos/dde_linux/src/drivers/framebuffer/intel/target.mk
index debb7d3165..331efc3145 100644
--- a/repos/dde_linux/src/drivers/framebuffer/intel/target.mk
+++ b/repos/dde_linux/src/drivers/framebuffer/intel/target.mk
@@ -20,7 +20,7 @@ SRC_CC  += irq.cc \
 INC_DIR += $(REP_DIR)/src/include
 
 vpath %.cc $(PRG_DIR)
-vpath %.cc $(REP_DIR)/src/lx_kit
+vpath %.cc $(REP_DIR)/src/lib/legacy/lx_kit
 
 CC_CXX_WARN_STRICT =
 CC_OPT += -Wno-narrowing
diff --git a/repos/dde_linux/src/drivers/nic/fec/lx_emul.cc b/repos/dde_linux/src/drivers/nic/fec/lx_emul.cc
index 772991bff6..03d50e7eae 100644
--- a/repos/dde_linux/src/drivers/nic/fec/lx_emul.cc
+++ b/repos/dde_linux/src/drivers/nic/fec/lx_emul.cc
@@ -30,16 +30,16 @@
 #include <os/backtrace.h>
 #endif
 
-#include <lx_emul/impl/kernel.h>
-#include <lx_emul/impl/delay.h>
-#include <lx_emul/impl/slab.h>
-#include <lx_emul/impl/work.h>
-#include <lx_emul/impl/spinlock.h>
-#include <lx_emul/impl/mutex.h>
-#include <lx_emul/impl/sched.h>
-#include <lx_emul/impl/timer.h>
-#include <lx_emul/impl/completion.h>
-#include <lx_kit/irq.h>
+#include <legacy/lx_emul/impl/kernel.h>
+#include <legacy/lx_emul/impl/delay.h>
+#include <legacy/lx_emul/impl/slab.h>
+#include <legacy/lx_emul/impl/work.h>
+#include <legacy/lx_emul/impl/spinlock.h>
+#include <legacy/lx_emul/impl/mutex.h>
+#include <legacy/lx_emul/impl/sched.h>
+#include <legacy/lx_emul/impl/timer.h>
+#include <legacy/lx_emul/impl/completion.h>
+#include <legacy/lx_kit/irq.h>
 
 extern "C" { struct page; }
 
@@ -372,10 +372,10 @@ _register_session(Linux_network_session_base &session,
 }
 
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 #include <linux/phy.h>
 #include <linux/timecounter.h>
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 extern "C" {
 
diff --git a/repos/dde_linux/src/drivers/nic/fec/lx_emul.h b/repos/dde_linux/src/drivers/nic/fec/lx_emul.h
index 216e509f66..3f4fe395c8 100644
--- a/repos/dde_linux/src/drivers/nic/fec/lx_emul.h
+++ b/repos/dde_linux/src/drivers/nic/fec/lx_emul.h
@@ -17,12 +17,12 @@
 #include <base/fixed_stdint.h>
 #include <stdarg.h>
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 
-#include <lx_emul/barrier.h>
-#include <lx_emul/compiler.h>
-#include <lx_emul/printf.h>
-#include <lx_emul/types.h>
+#include <legacy/lx_emul/barrier.h>
+#include <legacy/lx_emul/compiler.h>
+#include <legacy/lx_emul/printf.h>
+#include <legacy/lx_emul/types.h>
 
 static inline void __read_once_size(const volatile void *p, void *res, int size)
 {
@@ -54,7 +54,7 @@ static inline void __read_once_size(const volatile void *p, void *res, int size)
 #endif
 
 
-#include <lx_emul/list.h>
+#include <legacy/lx_emul/list.h>
 
 void lx_backtrace(void);
 
@@ -135,16 +135,16 @@ size_t iov_iter_count(struct iov_iter *i);
 #define netdev_warn(dev, fmt, args...) lx_printf("netdev_warn: " fmt, ##args)
 #define netdev_info(dev, fmt, args...) lx_printf("netdev_info: " fmt, ##args)
 
-#include <lx_emul/kernel.h>
-#include <lx_emul/irq.h>
-#include <lx_emul/jiffies.h>
-#include <lx_emul/time.h>
-#include <lx_emul/timer.h>
+#include <legacy/lx_emul/kernel.h>
+#include <legacy/lx_emul/irq.h>
+#include <legacy/lx_emul/jiffies.h>
+#include <legacy/lx_emul/time.h>
+#include <legacy/lx_emul/timer.h>
 
 #define from_timer(var, callback_timer, timer_fieldname) \
 	container_of(callback_timer, typeof(*var), timer_fieldname)
 
-#include <lx_emul/mutex.h>
+#include <legacy/lx_emul/mutex.h>
 
 LX_MUTEX_INIT_DECLARE(mdio_board_lock);
 LX_MUTEX_INIT_DECLARE(phy_fixup_lock);
@@ -152,15 +152,15 @@ LX_MUTEX_INIT_DECLARE(phy_fixup_lock);
 #define mdio_board_lock LX_MUTEX(mdio_board_lock)
 #define phy_fixup_lock LX_MUTEX(phy_fixup_lock)
 
-#include <lx_emul/bitops.h>
-#include <lx_emul/atomic.h>
-#include <lx_emul/spinlock.h>
-#include <lx_emul/work.h>
-#include <lx_emul/errno.h>
-#include <lx_emul/string.h>
-#include <lx_emul/module.h>
-#include <lx_emul/bug.h>
-#include <lx_emul/gfp.h>
+#include <legacy/lx_emul/bitops.h>
+#include <legacy/lx_emul/atomic.h>
+#include <legacy/lx_emul/spinlock.h>
+#include <legacy/lx_emul/work.h>
+#include <legacy/lx_emul/errno.h>
+#include <legacy/lx_emul/string.h>
+#include <legacy/lx_emul/module.h>
+#include <legacy/lx_emul/bug.h>
+#include <legacy/lx_emul/gfp.h>
 
 enum {
 	__GFP_COLD   = 0x00000100u,
@@ -168,14 +168,14 @@ enum {
 };
 
 #include <uapi/linux/swab.h>
-#include <lx_emul/byteorder.h>
-#include <lx_emul/completion.h>
-#include <lx_emul/ioport.h>
+#include <legacy/lx_emul/byteorder.h>
+#include <legacy/lx_emul/completion.h>
+#include <legacy/lx_emul/ioport.h>
 #include <uapi/linux/net_tstamp.h>
 #include <uapi/linux/ptp_clock.h>
-#include <lx_emul/pm.h>
-#include <lx_emul/scatterlist.h>
-#include <lx_emul/kobject.h>
+#include <legacy/lx_emul/pm.h>
+#include <legacy/lx_emul/scatterlist.h>
+#include <legacy/lx_emul/kobject.h>
 
 enum {
 	ETH_HLEN      = 14,
@@ -1933,6 +1933,6 @@ void *devm_kzalloc(struct device *dev, size_t size, gfp_t gfp);
 
 struct pm_qos_request {};
 
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 #endif /* _SRC__DRIVERS__NIC__FEC__LX_EMUL_H_ */
diff --git a/repos/dde_linux/src/drivers/nic/fec/main.cc b/repos/dde_linux/src/drivers/nic/fec/main.cc
index f05d504874..8d6d879448 100644
--- a/repos/dde_linux/src/drivers/nic/fec/main.cc
+++ b/repos/dde_linux/src/drivers/nic/fec/main.cc
@@ -22,13 +22,13 @@
 
 /* Linux emulation environment includes */
 #include <lx_emul.h>
-#include <lx_kit/env.h>
-#include <lx_kit/malloc.h>
-#include <lx_kit/scheduler.h>
-#include <lx_kit/timer.h>
-#include <lx_kit/irq.h>
-#include <lx_kit/backend_alloc.h>
-#include <lx_kit/work.h>
+#include <legacy/lx_kit/env.h>
+#include <legacy/lx_kit/malloc.h>
+#include <legacy/lx_kit/scheduler.h>
+#include <legacy/lx_kit/timer.h>
+#include <legacy/lx_kit/irq.h>
+#include <legacy/lx_kit/backend_alloc.h>
+#include <legacy/lx_kit/work.h>
 
 /* Linux module functions */
 extern "C" int module_fec_driver_init();
diff --git a/repos/dde_linux/src/drivers/nic/fec/platform.cc b/repos/dde_linux/src/drivers/nic/fec/platform.cc
index 96978f778d..ca599a4a3b 100644
--- a/repos/dde_linux/src/drivers/nic/fec/platform.cc
+++ b/repos/dde_linux/src/drivers/nic/fec/platform.cc
@@ -15,8 +15,8 @@
 
 #include <base/ram_allocator.h>
 
-#include <lx_kit/backend_alloc.h>
-#include <lx_kit/env.h>
+#include <legacy/lx_kit/backend_alloc.h>
+#include <legacy/lx_kit/env.h>
 
 
 /****************************
diff --git a/repos/dde_linux/src/drivers/nic/fec/target.inc b/repos/dde_linux/src/drivers/nic/fec/target.inc
index dbcf0de581..cbbbcc3b8a 100644
--- a/repos/dde_linux/src/drivers/nic/fec/target.inc
+++ b/repos/dde_linux/src/drivers/nic/fec/target.inc
@@ -45,6 +45,6 @@ vpath %.c  $(LX_CONTRIB_DIR)/net/core
 vpath %.c  $(LX_CONTRIB_DIR)/net/ethernet
 vpath %.c  $(PRG_DIR)/../..
 vpath %.cc $(PRG_DIR)/../..
-vpath %.cc $(REP_DIR)/src/lx_kit
+vpath %.cc $(REP_DIR)/src/lib/legacy/lx_kit
 
 CC_CXX_WARN_STRICT =
diff --git a/repos/dde_linux/src/drivers/nic/linux_network_session_base.cc b/repos/dde_linux/src/drivers/nic/linux_network_session_base.cc
index 737bf76864..6fe86c00d5 100644
--- a/repos/dde_linux/src/drivers/nic/linux_network_session_base.cc
+++ b/repos/dde_linux/src/drivers/nic/linux_network_session_base.cc
@@ -12,7 +12,7 @@
  */
 
 #include <linux_network_session_base.h>
-#include <lx_kit/scheduler.h>
+#include <legacy/lx_kit/scheduler.h>
 #include <lx_emul.h>
 
 
diff --git a/repos/dde_linux/src/drivers/nic/linux_network_session_base.h b/repos/dde_linux/src/drivers/nic/linux_network_session_base.h
index dca7faa1a1..4dd3a98cb6 100644
--- a/repos/dde_linux/src/drivers/nic/linux_network_session_base.h
+++ b/repos/dde_linux/src/drivers/nic/linux_network_session_base.h
@@ -14,7 +14,7 @@
 #ifndef _SRC__DRIVERS__NIC__LINUX_NETWORK_SESSION_BASE_H_
 #define _SRC__DRIVERS__NIC__LINUX_NETWORK_SESSION_BASE_H_
 
-#include <lx_kit/scheduler.h>
+#include <legacy/lx_kit/scheduler.h>
 
 /* forward declarations */
 extern "C" {
diff --git a/repos/dde_linux/src/drivers/usb_hid/driver.h b/repos/dde_linux/src/drivers/usb_hid/driver.h
index e4faeeecaa..ab655b38d7 100644
--- a/repos/dde_linux/src/drivers/usb_hid/driver.h
+++ b/repos/dde_linux/src/drivers/usb_hid/driver.h
@@ -19,7 +19,7 @@
 #include <base/heap.h>
 #include <usb_session/connection.h>
 #include <event_session/connection.h>
-#include <lx_kit/scheduler.h>
+#include <legacy/lx_kit/scheduler.h>
 
 struct usb_device_id;
 struct usb_interface;
diff --git a/repos/dde_linux/src/drivers/usb_hid/evdev.cc b/repos/dde_linux/src/drivers/usb_hid/evdev.cc
index 24aaa00f4b..e7cde6d6ca 100644
--- a/repos/dde_linux/src/drivers/usb_hid/evdev.cc
+++ b/repos/dde_linux/src/drivers/usb_hid/evdev.cc
@@ -29,8 +29,8 @@
 #include <util/reconstructible.h>
 
 /* LX kit */
-#include <lx_kit/env.h>
-#include <lx_kit/scheduler.h>
+#include <legacy/lx_kit/env.h>
+#include <legacy/lx_kit/scheduler.h>
 
 /* local */
 #include "led_state.h"
@@ -38,12 +38,12 @@
 /* Linux includes */
 #include <driver.h>
 #include <lx_emul.h>
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 #include <linux/hid.h>
 #include <linux/input.h>
 #include <linux/input/mt.h>
 #include <linux/usb.h>
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 
 static struct slot
diff --git a/repos/dde_linux/src/drivers/usb_hid/lx_emul.cc b/repos/dde_linux/src/drivers/usb_hid/lx_emul.cc
index a6f4a2d351..ec9b5900d0 100644
--- a/repos/dde_linux/src/drivers/usb_hid/lx_emul.cc
+++ b/repos/dde_linux/src/drivers/usb_hid/lx_emul.cc
@@ -5,24 +5,24 @@
 #include <driver.h>
 #include <lx_emul.h>
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 #include <linux/usb.h>
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 #define TRACE do { ; } while (0)
 
-#include <lx_emul/impl/kernel.h>
-#include <lx_emul/impl/delay.h>
-#include <lx_emul/impl/work.h>
-#include <lx_emul/impl/spinlock.h>
-#include <lx_emul/impl/mutex.h>
-#include <lx_emul/impl/sched.h>
-#include <lx_emul/impl/timer.h>
-#include <lx_emul/impl/completion.h>
-#include <lx_emul/impl/wait.h>
-#include <lx_emul/impl/usb.h>
+#include <legacy/lx_emul/impl/kernel.h>
+#include <legacy/lx_emul/impl/delay.h>
+#include <legacy/lx_emul/impl/work.h>
+#include <legacy/lx_emul/impl/spinlock.h>
+#include <legacy/lx_emul/impl/mutex.h>
+#include <legacy/lx_emul/impl/sched.h>
+#include <legacy/lx_emul/impl/timer.h>
+#include <legacy/lx_emul/impl/completion.h>
+#include <legacy/lx_emul/impl/wait.h>
+#include <legacy/lx_emul/impl/usb.h>
 
-#include <lx_kit/backend_alloc.h>
+#include <legacy/lx_kit/backend_alloc.h>
 
 extern "C" int usb_match_device(struct usb_device *dev,
                                 const struct usb_device_id *id)
diff --git a/repos/dde_linux/src/drivers/usb_hid/lx_emul.h b/repos/dde_linux/src/drivers/usb_hid/lx_emul.h
index e68b8e5c05..58585b0741 100644
--- a/repos/dde_linux/src/drivers/usb_hid/lx_emul.h
+++ b/repos/dde_linux/src/drivers/usb_hid/lx_emul.h
@@ -17,25 +17,25 @@
 #include <base/fixed_stdint.h>
 #include <stdarg.h>
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 
-#include <lx_emul/compiler.h>
-#include <lx_emul/printf.h>
-#include <lx_emul/types.h>
-#include <lx_emul/kernel.h>
+#include <legacy/lx_emul/compiler.h>
+#include <legacy/lx_emul/printf.h>
+#include <legacy/lx_emul/types.h>
+#include <legacy/lx_emul/kernel.h>
 
 enum { HZ = 100UL };
 
-#include <lx_emul/jiffies.h>
-#include <lx_emul/time.h>
-#include <lx_emul/bitops.h>
+#include <legacy/lx_emul/jiffies.h>
+#include <legacy/lx_emul/time.h>
+#include <legacy/lx_emul/bitops.h>
 
 typedef int clockid_t;
 
-#include <lx_emul/timer.h>
-#include <lx_emul/spinlock.h>
+#include <legacy/lx_emul/timer.h>
+#include <legacy/lx_emul/spinlock.h>
 
-#include <lx_emul/mutex.h>
+#include <legacy/lx_emul/mutex.h>
 
 LX_MUTEX_INIT_DECLARE(dquirks_lock);
 LX_MUTEX_INIT_DECLARE(input_mutex);
@@ -54,22 +54,22 @@ typedef __u64 __be64;
 #define DECLARE_BITMAP(name,bits) \
 	unsigned long name[BITS_TO_LONGS(bits)]
 
-#include <lx_emul/byteorder.h>
-#include <lx_emul/atomic.h>
-#include <lx_emul/work.h>
-#include <lx_emul/bug.h>
-#include <lx_emul/errno.h>
-#include <lx_emul/module.h>
-#include <lx_emul/gfp.h>
+#include <legacy/lx_emul/byteorder.h>
+#include <legacy/lx_emul/atomic.h>
+#include <legacy/lx_emul/work.h>
+#include <legacy/lx_emul/bug.h>
+#include <legacy/lx_emul/errno.h>
+#include <legacy/lx_emul/module.h>
+#include <legacy/lx_emul/gfp.h>
 
 static inline void barrier() { asm volatile ("": : :"memory"); }
 
 #define READ_ONCE(x) x
 
-#include <lx_emul/list.h>
-#include <lx_emul/string.h>
-#include <lx_emul/kobject.h>
-#include <lx_emul/completion.h>
+#include <legacy/lx_emul/list.h>
+#include <legacy/lx_emul/string.h>
+#include <legacy/lx_emul/kobject.h>
+#include <legacy/lx_emul/completion.h>
 
 struct file
 {
@@ -637,6 +637,6 @@ struct usb_hcd { unsigned amd_resume_bug:1; };
 
 bool usb_device_is_owned(struct usb_device *udev);
 
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 #endif /* _SRC__DRIVERS__USB_HID__LX_EMUL_H_ */
diff --git a/repos/dde_linux/src/drivers/usb_hid/main.cc b/repos/dde_linux/src/drivers/usb_hid/main.cc
index a0670670d0..9b071d22dc 100644
--- a/repos/dde_linux/src/drivers/usb_hid/main.cc
+++ b/repos/dde_linux/src/drivers/usb_hid/main.cc
@@ -16,15 +16,15 @@
 #include <driver.h>
 #include <lx_emul.h>
 
-#include <lx_kit/env.h>
-#include <lx_kit/scheduler.h>
-#include <lx_kit/timer.h>
-#include <lx_kit/work.h>
+#include <legacy/lx_kit/env.h>
+#include <legacy/lx_kit/scheduler.h>
+#include <legacy/lx_kit/timer.h>
+#include <legacy/lx_kit/work.h>
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 #include <linux/hid.h>
 #include <linux/usb.h>
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 extern "C" void usb_detect_interface_quirks(struct usb_device *udev);
 
diff --git a/repos/dde_linux/src/drivers/usb_hid/target.mk b/repos/dde_linux/src/drivers/usb_hid/target.mk
index 330d129401..c3d23e6584 100644
--- a/repos/dde_linux/src/drivers/usb_hid/target.mk
+++ b/repos/dde_linux/src/drivers/usb_hid/target.mk
@@ -38,4 +38,4 @@ CC_C_OPT += -Wno-unused-but-set-variable -Wno-pointer-sign \
 CC_CXX_WARN_STRICT =
 
 vpath %.c  $(USB_CONTRIB_DIR)
-vpath %.cc $(REP_DIR)/src/lx_kit
+vpath %.cc $(REP_DIR)/src/lib/legacy/lx_kit
diff --git a/repos/dde_linux/src/drivers/usb_host/lx_emul.cc b/repos/dde_linux/src/drivers/usb_host/lx_emul.cc
index 345dd93ddb..d2a4767c05 100644
--- a/repos/dde_linux/src/drivers/usb_host/lx_emul.cc
+++ b/repos/dde_linux/src/drivers/usb_host/lx_emul.cc
@@ -24,14 +24,14 @@
 #include "signal.h"
 #include "lx_emul.h"
 
-#include <lx_kit/backend_alloc.h>
-#include <lx_kit/irq.h>
-#include <lx_kit/scheduler.h>
-#include <lx_kit/work.h>
+#include <legacy/lx_kit/backend_alloc.h>
+#include <legacy/lx_kit/irq.h>
+#include <legacy/lx_kit/scheduler.h>
+#include <legacy/lx_kit/work.h>
 
 
-#include <lx_emul/impl/slab.h>
-#include <lx_emul/impl/mutex.h>
+#include <legacy/lx_emul/impl/slab.h>
+#include <legacy/lx_emul/impl/mutex.h>
 
 unsigned long loops_per_jiffy = 1;  /* needed by 'dwc_otg_attr.c' */
 
@@ -415,7 +415,7 @@ int fls(int x)
  ** linux/delay.h **
  *******************/
 
-#include <lx_emul/impl/delay.h>
+#include <legacy/lx_emul/impl/delay.h>
 
 void usleep_range(unsigned long min, unsigned long max)
 {
@@ -666,8 +666,8 @@ int blocking_notifier_call_chain(struct blocking_notifier_head *nh,
  ** linux/timer.h **
  *******************/
 
-#include <lx_emul/impl/timer.h>
-#include <lx_emul/impl/sched.h>
+#include <legacy/lx_emul/impl/timer.h>
+#include <legacy/lx_emul/impl/sched.h>
 
 signed long schedule_timeout_uninterruptible(signed long timeout)
 {
@@ -681,7 +681,7 @@ signed long schedule_timeout_uninterruptible(signed long timeout)
  ** linux/completion.h **
  ************************/
 
-#include <lx_emul/impl/completion.h>
+#include <legacy/lx_emul/impl/completion.h>
 
 
 long __wait_completion(struct completion *work, unsigned long timeout)
@@ -721,7 +721,7 @@ void reinit_completion(struct completion *work)
  ** linux/workqueue.h **
  ***********************/
 
-#include <lx_emul/impl/work.h>
+#include <legacy/lx_emul/impl/work.h>
 
 
 bool mod_delayed_work(struct workqueue_struct *wq, struct delayed_work *dwork,
@@ -773,7 +773,7 @@ struct workqueue_struct *alloc_workqueue(const char *fmt, unsigned int flags,
  ** linux/wait.h **
  ******************/
 
-#include <lx_emul/impl/wait.h>
+#include <legacy/lx_emul/impl/wait.h>
 
 
 static Genode::Bit_allocator<1024> id_allocator;
diff --git a/repos/dde_linux/src/drivers/usb_host/lx_emul.h b/repos/dde_linux/src/drivers/usb_host/lx_emul.h
index 3d1e61aeb4..71fd19fc0b 100644
--- a/repos/dde_linux/src/drivers/usb_host/lx_emul.h
+++ b/repos/dde_linux/src/drivers/usb_host/lx_emul.h
@@ -21,7 +21,7 @@
 #include <stdarg.h>
 #include <base/fixed_stdint.h>
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 
 #define DEBUG_COMPLETION   0
 #define DEBUG_DMA          0
@@ -41,7 +41,7 @@
 #define KBUILD_MODNAME "mod-noname"
 
 /* lx_printf */
-#include <lx_emul/printf.h>
+#include <legacy/lx_emul/printf.h>
 
 
 /*******************
@@ -62,7 +62,7 @@
  ** asm/bug.h **
  ***************/
 
-#include <lx_emul/bug.h>
+#include <legacy/lx_emul/bug.h>
 
 /*****************
  ** asm/param.h **
@@ -75,14 +75,14 @@ enum { HZ = 100UL };
  ** asm/atomic.h **
  ******************/
 
-#include <lx_emul/atomic.h>
+#include <legacy/lx_emul/atomic.h>
 
 
 /*******************
  ** linux/types.h **
  *******************/
 
-#include <lx_emul/types.h>
+#include <legacy/lx_emul/types.h>
 
 typedef __u16 __le16;
 typedef __u32 __le32;
@@ -112,8 +112,8 @@ extern unsigned long loops_per_jiffy;  /* needed by 'dwc_otg_attr.c' */
  ** linux/compiler.h **
  **********************/
 
-#include <lx_emul/barrier.h>
-#include <lx_emul/compiler.h>
+#include <legacy/lx_emul/barrier.h>
+#include <legacy/lx_emul/compiler.h>
 
 #define __must_hold(x)
 
@@ -158,7 +158,7 @@ typedef struct { __u8 b[16]; } uuid_le;
  ** linux/byteorder/generic.h **
  *******************************/
 
-#include <lx_emul/byteorder.h>
+#include <legacy/lx_emul/byteorder.h>
 
 struct __una_u16 { u16 x; } __attribute__((packed));
 struct __una_u32 { u32 x; } __attribute__((packed));
@@ -202,7 +202,7 @@ struct page
  ** linux/errno.h and friends **
  *******************************/
 
-#include <lx_emul/errno.h>
+#include <legacy/lx_emul/errno.h>
 
 enum {
 	EISDIR        = 21,
@@ -219,7 +219,7 @@ enum {
  ** linux/kernel.h **
  ********************/
 
-#include <lx_emul/kernel.h>
+#include <legacy/lx_emul/kernel.h>
 
 char *kasprintf(gfp_t gfp, const char *fmt, ...);
 int   kstrtouint(const char *s, unsigned int base, unsigned int *res);
@@ -251,7 +251,7 @@ bool in_softirq(void);
  ** linux/jiffies.h **
  *********************/
 
-#include <lx_emul/jiffies.h>
+#include <legacy/lx_emul/jiffies.h>
 
 
 /*********************
@@ -353,7 +353,7 @@ static inline unsigned long find_next_zero_bit_le(const unsigned long *addr, uns
  ** linux/string.h **
  ********************/
 
-#include <lx_emul/string.h>
+#include <legacy/lx_emul/string.h>
 
 int strtobool(const char *, bool *);
 
@@ -377,7 +377,7 @@ int utf16s_to_utf8s(const wchar_t *pwcs, int len, enum utf16_endian endian, u8 *
  ** linux/init.h **
  ******************/
 
-#include <lx_emul/module.h>
+#include <legacy/lx_emul/module.h>
 
 #define __initconst
 
@@ -430,14 +430,14 @@ void *kmalloc_array(size_t n, size_t size, gfp_t flags);
  ** linux/spinlock.h **
  **********************/
 
-#include <lx_emul/spinlock.h>
+#include <legacy/lx_emul/spinlock.h>
 
 
 /*******************
  ** linux/mutex.h **
  *******************/
 
-#include <lx_emul/mutex.h>
+#include <legacy/lx_emul/mutex.h>
 
 LX_MUTEX_INIT_DECLARE(init_usb_class_mutex);
 LX_MUTEX_INIT_DECLARE(usb_bus_idr_lock);
@@ -454,21 +454,21 @@ LX_MUTEX_INIT_DECLARE(usbfs_mutex);
  ** linux/rwsem.h **
  *******************/
 
-#include <lx_emul/semaphore.h>
+#include <legacy/lx_emul/semaphore.h>
 
 
 /******************
  ** linux/time.h **
  ******************/
 
-#include <lx_emul/time.h>
+#include <legacy/lx_emul/time.h>
 
 
 /*******************
  ** linux/timer.h **
  *******************/
 
-#include <lx_emul/timer.h>
+#include <legacy/lx_emul/timer.h>
 
 #define from_timer(var, callback_timer, timer_fieldname) \
 	container_of(callback_timer, typeof(*var), timer_fieldname)
@@ -487,7 +487,7 @@ void usleep_range(unsigned long min, unsigned long max);
  ** linux/workquque.h **
  ***********************/
 
-#include <lx_emul/work.h>
+#include <legacy/lx_emul/work.h>
 
 enum {
 	WORK_STRUCT_PENDING_BIT = 0,
@@ -598,7 +598,7 @@ int atomic_notifier_chain_unregister(struct atomic_notifier_head *nh, struct not
  ** linux/scatterlist.h **
  *************************/
 
-#include <lx_emul/scatterlist.h>
+#include <legacy/lx_emul/scatterlist.h>
 
 size_t sg_pcopy_from_buffer(struct scatterlist *sgl, unsigned int nents, const void *buf, size_t buflen, off_t skip);
 size_t sg_pcopy_to_buffer(struct scatterlist *sgl, unsigned int nents, void *buf, size_t buflen, off_t skip);
@@ -608,7 +608,7 @@ size_t sg_pcopy_to_buffer(struct scatterlist *sgl, unsigned int nents, void *buf
  ** linux/kobject.h **
  *********************/
 
-#include <lx_emul/kobject.h>
+#include <legacy/lx_emul/kobject.h>
 
 
 /*******************
@@ -645,7 +645,7 @@ void sysfs_remove_link(struct kobject *kobj, const char *name);
  ** linux/pm.h **
  ****************/
 
-#include <lx_emul/pm.h>
+#include <legacy/lx_emul/pm.h>
 
 #define PMSG_AUTO_SUSPEND ((struct pm_message) \
                            { .event = PM_EVENT_AUTO_SUSPEND, })
@@ -1111,7 +1111,7 @@ struct seq_file { int dummy; };
  ** linux/gfp.h **
  *****************/
 
-#include <lx_emul/gfp.h>
+#include <legacy/lx_emul/gfp.h>
 
 enum {
 	GFP_NOIO     = GFP_LX_DMA,
@@ -1155,7 +1155,7 @@ int    is_vmalloc_addr(const void *x);
  ** asm-generic/io.h **
  **********************/
 
-#include <lx_emul/mmio.h>
+#include <legacy/lx_emul/mmio.h>
 
 void *ioremap(phys_addr_t addr, unsigned long size);
 void  iounmap(volatile void *addr);
@@ -1188,14 +1188,14 @@ static inline u32 inl_p(u32 port) { u32 ret = inl(port); native_io_delay(); retu
  ** linux/ioport.h **
  ********************/
 
-#include <lx_emul/ioport.h>
+#include <legacy/lx_emul/ioport.h>
 
 
 /***********************
  ** linux/irqreturn.h **
  ***********************/
 
-#include <lx_emul/irq.h>
+#include <legacy/lx_emul/irq.h>
 
 #define IRQ_RETVAL(x) ((x) != IRQ_NONE)
 
@@ -1277,7 +1277,7 @@ struct pci_fixup {
 	void (*hook)(struct pci_dev *dev);
 };
 
-#include <lx_emul/pci.h>
+#include <legacy/lx_emul/pci.h>
 #include <linux/mod_devicetable.h>
 
 #define PCI_DEVICE_CLASS(dev_class,dev_class_mask) \
@@ -1402,7 +1402,7 @@ struct new_utsname *init_utsname(void);
  ** linux/completion.h **
  ************************/
 
-#include <lx_emul/completion.h>
+#include <legacy/lx_emul/completion.h>
 
 struct completion { unsigned int done; void *task; };
 long  __wait_completion(struct completion *work, unsigned long timeout);;
@@ -1413,7 +1413,7 @@ void reinit_completion(struct completion *x);
  ** linux/list.h **
  ******************/
 
-#include <lx_emul/list.h>
+#include <legacy/lx_emul/list.h>
 
 
 /********************
@@ -1828,6 +1828,6 @@ static inline void trace_xhci_dbg_address(struct va_format *v) {}
 void lx_backtrace(void);
 void lx_platform_device_init(void);
 
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 #endif /* _LX_EMUL_H_ */
diff --git a/repos/dde_linux/src/drivers/usb_host/main.cc b/repos/dde_linux/src/drivers/usb_host/main.cc
index 080df0fbd0..d84dce3782 100644
--- a/repos/dde_linux/src/drivers/usb_host/main.cc
+++ b/repos/dde_linux/src/drivers/usb_host/main.cc
@@ -20,13 +20,13 @@
 #include <signal.h>
 #include <lx_emul.h>
 
-#include <lx_kit/env.h>
-#include <lx_kit/pci.h>
-#include <lx_kit/irq.h>
-#include <lx_kit/malloc.h>
-#include <lx_kit/scheduler.h>
-#include <lx_kit/timer.h>
-#include <lx_kit/work.h>
+#include <legacy/lx_kit/env.h>
+#include <legacy/lx_kit/pci.h>
+#include <legacy/lx_kit/irq.h>
+#include <legacy/lx_kit/malloc.h>
+#include <legacy/lx_kit/scheduler.h>
+#include <legacy/lx_kit/timer.h>
+#include <legacy/lx_kit/work.h>
 
 
 using namespace Genode;
diff --git a/repos/dde_linux/src/drivers/usb_host/platform.h b/repos/dde_linux/src/drivers/usb_host/platform.h
index 7ceb46b338..257a4ebea7 100644
--- a/repos/dde_linux/src/drivers/usb_host/platform.h
+++ b/repos/dde_linux/src/drivers/usb_host/platform.h
@@ -20,7 +20,7 @@
 #include <util/xml_node.h>
 #include <irq_session/capability.h>
 
-#include <lx_kit/env.h>
+#include <legacy/lx_kit/env.h>
 
 struct Services
 {
diff --git a/repos/dde_linux/src/drivers/usb_host/raw.cc b/repos/dde_linux/src/drivers/usb_host/raw.cc
index b2153c2f1e..0a3daadaf5 100644
--- a/repos/dde_linux/src/drivers/usb_host/raw.cc
+++ b/repos/dde_linux/src/drivers/usb_host/raw.cc
@@ -19,15 +19,15 @@
 #include <util/list.h>
 
 #include <lx_emul.h>
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 #include <linux/usb.h>
 #include <linux/usb/hcd.h>
 #include "raw.h"
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 #include <signal.h>
 
-#include <lx_kit/malloc.h>
-#include <lx_kit/scheduler.h>
+#include <legacy/lx_kit/malloc.h>
+#include <legacy/lx_kit/scheduler.h>
 
 using namespace Genode;
 
diff --git a/repos/dde_linux/src/drivers/usb_host/spec/arm/platform.cc b/repos/dde_linux/src/drivers/usb_host/spec/arm/platform.cc
index 453065ac70..232e834f04 100644
--- a/repos/dde_linux/src/drivers/usb_host/spec/arm/platform.cc
+++ b/repos/dde_linux/src/drivers/usb_host/spec/arm/platform.cc
@@ -15,9 +15,9 @@
 #include <platform.h>
 
 #include <lx_emul.h>
-#include <lx_kit/backend_alloc.h>
-#include <lx_kit/irq.h>
-#include <lx_kit/malloc.h>
+#include <legacy/lx_kit/backend_alloc.h>
+#include <legacy/lx_kit/irq.h>
+#include <legacy/lx_kit/malloc.h>
 
 using namespace Genode;
 
diff --git a/repos/dde_linux/src/drivers/usb_host/spec/x86/platform.cc b/repos/dde_linux/src/drivers/usb_host/spec/x86/platform.cc
index be425fac6a..5bf1bcd4d7 100644
--- a/repos/dde_linux/src/drivers/usb_host/spec/x86/platform.cc
+++ b/repos/dde_linux/src/drivers/usb_host/spec/x86/platform.cc
@@ -21,14 +21,14 @@
 #include <lx_emul.h>
 #include <platform.h>
 
-#include <lx_kit/env.h>
-#include <lx_kit/irq.h>
-#include <lx_kit/pci_dev_registry.h>
-#include <lx_kit/malloc.h>
-#include <lx_kit/mapped_io_mem_range.h>
+#include <legacy/lx_kit/env.h>
+#include <legacy/lx_kit/irq.h>
+#include <legacy/lx_kit/pci_dev_registry.h>
+#include <legacy/lx_kit/malloc.h>
+#include <legacy/lx_kit/mapped_io_mem_range.h>
 
-#include <lx_emul/impl/io.h>
-#include <lx_emul/impl/pci_resource.h>
+#include <legacy/lx_emul/impl/io.h>
+#include <legacy/lx_emul/impl/pci_resource.h>
 
 
 /**
diff --git a/repos/dde_linux/src/drivers/usb_host/target.inc b/repos/dde_linux/src/drivers/usb_host/target.inc
index 8eeeeceabe..0cf6e57538 100644
--- a/repos/dde_linux/src/drivers/usb_host/target.inc
+++ b/repos/dde_linux/src/drivers/usb_host/target.inc
@@ -65,5 +65,5 @@ CC_C_OPT += -Wno-format
 vpath lib/ctype.c    $(LX_CONTRIB_DIR)
 vpath lib/find_bit.c $(LX_CONTRIB_DIR)
 vpath %.c            $(LX_CONTRIB_DIR)/drivers
-vpath %.cc           $(REP_DIR)/src
+vpath %.cc           $(REP_DIR)/src/lib/legacy
 vpath %              $(REP_DIR)/src/drivers/usb_host
diff --git a/repos/dde_linux/src/drivers/usb_modem/driver.h b/repos/dde_linux/src/drivers/usb_modem/driver.h
index 9097838120..97e5f3797b 100644
--- a/repos/dde_linux/src/drivers/usb_modem/driver.h
+++ b/repos/dde_linux/src/drivers/usb_modem/driver.h
@@ -27,11 +27,11 @@
 #include <terminal.h>
 
 /* Linux emulation environment includes */
-#include <lx_kit/scheduler.h>
+#include <legacy/lx_kit/scheduler.h>
 #include <lx_emul.h>
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 #include <linux/usb.h>
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 struct usb_device_id;
 struct usb_interface;
diff --git a/repos/dde_linux/src/drivers/usb_modem/fec_nic.cc b/repos/dde_linux/src/drivers/usb_modem/fec_nic.cc
index 06b1bdb201..bec44cb6d2 100644
--- a/repos/dde_linux/src/drivers/usb_modem/fec_nic.cc
+++ b/repos/dde_linux/src/drivers/usb_modem/fec_nic.cc
@@ -12,7 +12,7 @@
  */
 
 #include <fec_nic.h>
-#include <lx_kit/scheduler.h>
+#include <legacy/lx_kit/scheduler.h>
 #include <lx_emul.h>
 
 
diff --git a/repos/dde_linux/src/drivers/usb_modem/fec_nic.h b/repos/dde_linux/src/drivers/usb_modem/fec_nic.h
index 4829e9e448..b43ce9e397 100644
--- a/repos/dde_linux/src/drivers/usb_modem/fec_nic.h
+++ b/repos/dde_linux/src/drivers/usb_modem/fec_nic.h
@@ -14,7 +14,7 @@
 #ifndef _SRC__DRIVERS__NIC__FEC__FEC_NIC_H_
 #define _SRC__DRIVERS__NIC__FEC__FEC_NIC_H_
 
-#include <lx_kit/scheduler.h>
+#include <legacy/lx_kit/scheduler.h>
 
 /* forward declarations */
 extern "C" {
diff --git a/repos/dde_linux/src/drivers/usb_modem/lx_emul.cc b/repos/dde_linux/src/drivers/usb_modem/lx_emul.cc
index 3e93637a98..09e5138291 100644
--- a/repos/dde_linux/src/drivers/usb_modem/lx_emul.cc
+++ b/repos/dde_linux/src/drivers/usb_modem/lx_emul.cc
@@ -21,27 +21,27 @@
 #include <driver.h>
 #include <lx_emul.h>
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 #include <linux/usb.h>
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 #define TRACE do { ; } while (0)
 
-#include <lx_emul/impl/delay.h>
-#include <lx_emul/impl/slab.h>
-#include <lx_emul/impl/work.h>
-#include <lx_emul/impl/spinlock.h>
-#include <lx_emul/impl/mutex.h>
-#include <lx_emul/impl/sched.h>
-#include <lx_emul/impl/timer.h>
-#include <lx_emul/impl/completion.h>
-#include <lx_emul/impl/wait.h>
-#include <lx_emul/impl/usb.h>
+#include <legacy/lx_emul/impl/delay.h>
+#include <legacy/lx_emul/impl/slab.h>
+#include <legacy/lx_emul/impl/work.h>
+#include <legacy/lx_emul/impl/spinlock.h>
+#include <legacy/lx_emul/impl/mutex.h>
+#include <legacy/lx_emul/impl/sched.h>
+#include <legacy/lx_emul/impl/timer.h>
+#include <legacy/lx_emul/impl/completion.h>
+#include <legacy/lx_emul/impl/wait.h>
+#include <legacy/lx_emul/impl/usb.h>
 
-#include <lx_kit/backend_alloc.h>
+#include <legacy/lx_kit/backend_alloc.h>
 
-#include <lx_emul/extern_c_begin.h>
-#include <lx_emul/impl/kernel.h>
+#include <legacy/lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/impl/kernel.h>
 
 #include <linux/mii.h>
 
@@ -130,7 +130,7 @@ int usb_match_one_id(struct usb_interface *interface,
 	return usb_match_one_id_intf(dev, intf, id);
 }
 
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 
 class Addr_to_page_mapping : public Genode::List<Addr_to_page_mapping>::Element
diff --git a/repos/dde_linux/src/drivers/usb_modem/lx_emul.h b/repos/dde_linux/src/drivers/usb_modem/lx_emul.h
index 299b4061ac..b08e200a0e 100644
--- a/repos/dde_linux/src/drivers/usb_modem/lx_emul.h
+++ b/repos/dde_linux/src/drivers/usb_modem/lx_emul.h
@@ -18,27 +18,27 @@
 #include <base/fixed_stdint.h>
 #include <stdarg.h>
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 
 #define __KERNEL__ 1
 
-#include <lx_emul/compiler.h>
-#include <lx_emul/printf.h>
-#include <lx_emul/types.h>
-#include <lx_emul/kernel.h>
+#include <legacy/lx_emul/compiler.h>
+#include <legacy/lx_emul/printf.h>
+#include <legacy/lx_emul/types.h>
+#include <legacy/lx_emul/kernel.h>
 
 #define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
 
 enum { HZ = 100UL };
 
-#include <lx_emul/jiffies.h>
-#include <lx_emul/time.h>
-#include <lx_emul/bitops.h>
+#include <legacy/lx_emul/jiffies.h>
+#include <legacy/lx_emul/time.h>
+#include <legacy/lx_emul/bitops.h>
 
 typedef int clockid_t;
 
-#include <lx_emul/timer.h>
-#include <lx_emul/spinlock.h>
+#include <legacy/lx_emul/timer.h>
+#include <legacy/lx_emul/spinlock.h>
 
 typedef __u16 __le16;
 typedef __u32 __le32;
@@ -49,24 +49,24 @@ typedef __u64 __be64;
 
 #define __aligned_u64 __u64 __attribute__((aligned(8)))
 
-#include <lx_emul/byteorder.h>
-#include <lx_emul/atomic.h>
-#include <lx_emul/work.h>
-#include <lx_emul/bug.h>
-#include <lx_emul/errno.h>
-#include <lx_emul/module.h>
-#include <lx_emul/gfp.h>
-#include <lx_emul/barrier.h>
+#include <legacy/lx_emul/byteorder.h>
+#include <legacy/lx_emul/atomic.h>
+#include <legacy/lx_emul/work.h>
+#include <legacy/lx_emul/bug.h>
+#include <legacy/lx_emul/errno.h>
+#include <legacy/lx_emul/module.h>
+#include <legacy/lx_emul/gfp.h>
+#include <legacy/lx_emul/barrier.h>
 
 #define READ_ONCE(x) x
 
-#include <lx_emul/list.h>
-#include <lx_emul/string.h>
-#include <lx_emul/mutex.h>
-#include <lx_emul/kobject.h>
-#include <lx_emul/completion.h>
-#include <lx_emul/pm.h>
-#include <lx_emul/scatterlist.h>
+#include <legacy/lx_emul/list.h>
+#include <legacy/lx_emul/string.h>
+#include <legacy/lx_emul/mutex.h>
+#include <legacy/lx_emul/kobject.h>
+#include <legacy/lx_emul/completion.h>
+#include <legacy/lx_emul/pm.h>
+#include <legacy/lx_emul/scatterlist.h>
 
 struct user_namespace {};
 
@@ -1443,6 +1443,6 @@ struct nd_msg
 #include <linux/skbuff.h>
 #include <linux/rculist.h>
 
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 #endif /* _SRC__DRIVERS__USB_HID__LX_EMUL_H_ */
diff --git a/repos/dde_linux/src/drivers/usb_modem/main.cc b/repos/dde_linux/src/drivers/usb_modem/main.cc
index e88db59663..490a8c291a 100644
--- a/repos/dde_linux/src/drivers/usb_modem/main.cc
+++ b/repos/dde_linux/src/drivers/usb_modem/main.cc
@@ -17,11 +17,11 @@
 #include <driver.h>
 #include <lx_emul.h>
 
-#include <lx_kit/env.h>
-#include <lx_kit/malloc.h>
-#include <lx_kit/scheduler.h>
-#include <lx_kit/timer.h>
-#include <lx_kit/work.h>
+#include <legacy/lx_kit/env.h>
+#include <legacy/lx_kit/malloc.h>
+#include <legacy/lx_kit/scheduler.h>
+#include <legacy/lx_kit/timer.h>
+#include <legacy/lx_kit/work.h>
 
 struct workqueue_struct *tasklet_wq;
 
diff --git a/repos/dde_linux/src/drivers/usb_modem/target.mk b/repos/dde_linux/src/drivers/usb_modem/target.mk
index 5515d95f94..925b0d75fe 100644
--- a/repos/dde_linux/src/drivers/usb_modem/target.mk
+++ b/repos/dde_linux/src/drivers/usb_modem/target.mk
@@ -26,4 +26,4 @@ CC_C_OPT += -Wno-comment -Wno-int-conversion -Wno-incompatible-pointer-types \
 CC_CXX_WARN_STRICT =
 
 vpath %.c  $(USB_CONTRIB_DIR)
-vpath %.cc $(REP_DIR)/src/lx_kit
+vpath %.cc $(REP_DIR)/src/lib/legacy/lx_kit
diff --git a/repos/dde_linux/src/drivers/usb_modem/terminal.cc b/repos/dde_linux/src/drivers/usb_modem/terminal.cc
index c65281c95b..4c3f753e9c 100644
--- a/repos/dde_linux/src/drivers/usb_modem/terminal.cc
+++ b/repos/dde_linux/src/drivers/usb_modem/terminal.cc
@@ -15,9 +15,9 @@
 #include <terminal.h>
 #include <lx_emul.h>
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 #include <linux/usb.h>
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 using namespace Terminal;
 
diff --git a/repos/dde_linux/src/drivers/usb_modem/terminal.h b/repos/dde_linux/src/drivers/usb_modem/terminal.h
index a015e9ca09..921f0acee5 100644
--- a/repos/dde_linux/src/drivers/usb_modem/terminal.h
+++ b/repos/dde_linux/src/drivers/usb_modem/terminal.h
@@ -22,7 +22,7 @@
 #include <root/component.h>
 #include <terminal_session/terminal_session.h>
 
-#include <lx_kit/scheduler.h>
+#include <legacy/lx_kit/scheduler.h>
 
 namespace Terminal {
 	class Session_component;
diff --git a/repos/dde_linux/src/drivers/usb_net/driver.h b/repos/dde_linux/src/drivers/usb_net/driver.h
index 4ce0dcaf9c..0458602e18 100644
--- a/repos/dde_linux/src/drivers/usb_net/driver.h
+++ b/repos/dde_linux/src/drivers/usb_net/driver.h
@@ -26,7 +26,7 @@
 #include <component.h>
 
 /* Linux emulation environment includes */
-#include <lx_kit/scheduler.h>
+#include <legacy/lx_kit/scheduler.h>
 
 /* NIC driver includes */
 #include <drivers/nic/mode.h>
diff --git a/repos/dde_linux/src/drivers/usb_net/lx_emul.cc b/repos/dde_linux/src/drivers/usb_net/lx_emul.cc
index 7fecd4f739..1a968731b9 100644
--- a/repos/dde_linux/src/drivers/usb_net/lx_emul.cc
+++ b/repos/dde_linux/src/drivers/usb_net/lx_emul.cc
@@ -7,27 +7,27 @@
 #include <driver.h>
 #include <lx_emul.h>
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 #include <linux/usb.h>
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 #define TRACE do { ; } while (0)
 
-#include <lx_emul/impl/kernel.h>
-#include <lx_emul/impl/delay.h>
-#include <lx_emul/impl/slab.h>
-#include <lx_emul/impl/work.h>
-#include <lx_emul/impl/spinlock.h>
-#include <lx_emul/impl/mutex.h>
-#include <lx_emul/impl/sched.h>
-#include <lx_emul/impl/timer.h>
-#include <lx_emul/impl/completion.h>
-#include <lx_emul/impl/wait.h>
-#include <lx_emul/impl/usb.h>
+#include <legacy/lx_emul/impl/kernel.h>
+#include <legacy/lx_emul/impl/delay.h>
+#include <legacy/lx_emul/impl/slab.h>
+#include <legacy/lx_emul/impl/work.h>
+#include <legacy/lx_emul/impl/spinlock.h>
+#include <legacy/lx_emul/impl/mutex.h>
+#include <legacy/lx_emul/impl/sched.h>
+#include <legacy/lx_emul/impl/timer.h>
+#include <legacy/lx_emul/impl/completion.h>
+#include <legacy/lx_emul/impl/wait.h>
+#include <legacy/lx_emul/impl/usb.h>
 
-#include <lx_kit/backend_alloc.h>
+#include <legacy/lx_kit/backend_alloc.h>
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 
 #include <linux/mii.h>
 
@@ -116,7 +116,7 @@ int usb_match_one_id(struct usb_interface *interface,
 	return usb_match_one_id_intf(dev, intf, id);
 }
 
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 
 class Addr_to_page_mapping : public Genode::List<Addr_to_page_mapping>::Element
diff --git a/repos/dde_linux/src/drivers/usb_net/lx_emul.h b/repos/dde_linux/src/drivers/usb_net/lx_emul.h
index bc19f42724..b4a9b85761 100644
--- a/repos/dde_linux/src/drivers/usb_net/lx_emul.h
+++ b/repos/dde_linux/src/drivers/usb_net/lx_emul.h
@@ -17,28 +17,28 @@
 #include <base/fixed_stdint.h>
 #include <stdarg.h>
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 
 #define __KERNEL__ 1
 
-#include <lx_emul/compiler.h>
-#include <lx_emul/printf.h>
-#include <lx_emul/types.h>
-#include <lx_emul/kernel.h>
+#include <legacy/lx_emul/compiler.h>
+#include <legacy/lx_emul/printf.h>
+#include <legacy/lx_emul/types.h>
+#include <legacy/lx_emul/kernel.h>
 
 #define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
 
 enum { HZ = 100UL };
 
-#include <lx_emul/jiffies.h>
-#include <lx_emul/time.h>
-#include <lx_emul/bitops.h>
+#include <legacy/lx_emul/jiffies.h>
+#include <legacy/lx_emul/time.h>
+#include <legacy/lx_emul/bitops.h>
 
 typedef int clockid_t;
 
-#include <lx_emul/timer.h>
-#include <lx_emul/spinlock.h>
-#include <lx_emul/mutex.h>
+#include <legacy/lx_emul/timer.h>
+#include <legacy/lx_emul/spinlock.h>
+#include <legacy/lx_emul/mutex.h>
 
 typedef __u16 __le16;
 typedef __u32 __le32;
@@ -47,12 +47,12 @@ typedef __u64 __be64;
 
 #define __aligned_u64 __u64 __attribute__((aligned(8)))
 
-#include <lx_emul/byteorder.h>
-#include <lx_emul/atomic.h>
-#include <lx_emul/work.h>
-#include <lx_emul/bug.h>
-#include <lx_emul/errno.h>
-#include <lx_emul/module.h>
+#include <legacy/lx_emul/byteorder.h>
+#include <legacy/lx_emul/atomic.h>
+#include <legacy/lx_emul/work.h>
+#include <legacy/lx_emul/bug.h>
+#include <legacy/lx_emul/errno.h>
+#include <legacy/lx_emul/module.h>
 //#define __init
 //#define __exit
 //#define THIS_MODULE 0
@@ -66,17 +66,17 @@ typedef __u64 __be64;
 //#define MODULE_VERSION(x)
 //#define MODULE_PARM_DESC(_parm, desc)
 //#define module_param(name, type, perm)
-#include <lx_emul/gfp.h>
-#include <lx_emul/barrier.h>
+#include <legacy/lx_emul/gfp.h>
+#include <legacy/lx_emul/barrier.h>
 
 #define READ_ONCE(x) x
 
-#include <lx_emul/list.h>
-#include <lx_emul/string.h>
-#include <lx_emul/kobject.h>
-#include <lx_emul/completion.h>
-#include <lx_emul/pm.h>
-#include <lx_emul/scatterlist.h>
+#include <legacy/lx_emul/list.h>
+#include <legacy/lx_emul/string.h>
+#include <legacy/lx_emul/kobject.h>
+#include <legacy/lx_emul/completion.h>
+#include <legacy/lx_emul/pm.h>
+#include <legacy/lx_emul/scatterlist.h>
 
 struct user_namespace {};
 
@@ -1289,6 +1289,6 @@ int module_rndis_driver_init();
 #include <linux/skbuff.h>
 #include <linux/rculist.h>
 
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 #endif /* _SRC__DRIVERS__USB_HID__LX_EMUL_H_ */
diff --git a/repos/dde_linux/src/drivers/usb_net/main.cc b/repos/dde_linux/src/drivers/usb_net/main.cc
index 421b88c27d..3989b47b59 100644
--- a/repos/dde_linux/src/drivers/usb_net/main.cc
+++ b/repos/dde_linux/src/drivers/usb_net/main.cc
@@ -16,15 +16,15 @@
 #include <driver.h>
 #include <lx_emul.h>
 
-#include <lx_kit/env.h>
-#include <lx_kit/malloc.h>
-#include <lx_kit/scheduler.h>
-#include <lx_kit/timer.h>
-#include <lx_kit/work.h>
+#include <legacy/lx_kit/env.h>
+#include <legacy/lx_kit/malloc.h>
+#include <legacy/lx_kit/scheduler.h>
+#include <legacy/lx_kit/timer.h>
+#include <legacy/lx_kit/work.h>
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 #include <linux/usb.h>
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 struct workqueue_struct *tasklet_wq;
 
diff --git a/repos/dde_linux/src/drivers/usb_net/target.mk b/repos/dde_linux/src/drivers/usb_net/target.mk
index 98152ebc91..c3ead71000 100644
--- a/repos/dde_linux/src/drivers/usb_net/target.mk
+++ b/repos/dde_linux/src/drivers/usb_net/target.mk
@@ -32,4 +32,4 @@ CC_CXX_WARN_STRICT =
 
 vpath linux_network_session_base.cc $(REP_DIR)/src/drivers/nic
 vpath %.c  $(USB_CONTRIB_DIR)
-vpath %.cc $(REP_DIR)/src/lx_kit
+vpath %.cc $(REP_DIR)/src/lib/legacy/lx_kit
diff --git a/repos/dde_linux/src/include/lx_emul/atomic.h b/repos/dde_linux/src/include/legacy/lx_emul/atomic.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/atomic.h
rename to repos/dde_linux/src/include/legacy/lx_emul/atomic.h
diff --git a/repos/dde_linux/src/include/lx_emul/bitops.h b/repos/dde_linux/src/include/legacy/lx_emul/bitops.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/bitops.h
rename to repos/dde_linux/src/include/legacy/lx_emul/bitops.h
diff --git a/repos/dde_linux/src/include/lx_emul/bug.h b/repos/dde_linux/src/include/legacy/lx_emul/bug.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/bug.h
rename to repos/dde_linux/src/include/legacy/lx_emul/bug.h
diff --git a/repos/dde_linux/src/include/lx_emul/byteorder.h b/repos/dde_linux/src/include/legacy/lx_emul/byteorder.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/byteorder.h
rename to repos/dde_linux/src/include/legacy/lx_emul/byteorder.h
diff --git a/repos/dde_linux/src/include/lx_emul/compiler.h b/repos/dde_linux/src/include/legacy/lx_emul/compiler.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/compiler.h
rename to repos/dde_linux/src/include/legacy/lx_emul/compiler.h
diff --git a/repos/dde_linux/src/include/lx_emul/completion.h b/repos/dde_linux/src/include/legacy/lx_emul/completion.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/completion.h
rename to repos/dde_linux/src/include/legacy/lx_emul/completion.h
diff --git a/repos/dde_linux/src/include/lx_emul/errno.h b/repos/dde_linux/src/include/legacy/lx_emul/errno.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/errno.h
rename to repos/dde_linux/src/include/legacy/lx_emul/errno.h
diff --git a/repos/dde_linux/src/include/lx_emul/extern_c_begin.h b/repos/dde_linux/src/include/legacy/lx_emul/extern_c_begin.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/extern_c_begin.h
rename to repos/dde_linux/src/include/legacy/lx_emul/extern_c_begin.h
diff --git a/repos/dde_linux/src/include/lx_emul/extern_c_end.h b/repos/dde_linux/src/include/legacy/lx_emul/extern_c_end.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/extern_c_end.h
rename to repos/dde_linux/src/include/legacy/lx_emul/extern_c_end.h
diff --git a/repos/dde_linux/src/include/lx_emul/gfp.h b/repos/dde_linux/src/include/legacy/lx_emul/gfp.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/gfp.h
rename to repos/dde_linux/src/include/legacy/lx_emul/gfp.h
diff --git a/repos/dde_linux/src/include/lx_emul/impl/completion.h b/repos/dde_linux/src/include/legacy/lx_emul/impl/completion.h
similarity index 97%
rename from repos/dde_linux/src/include/lx_emul/impl/completion.h
rename to repos/dde_linux/src/include/legacy/lx_emul/impl/completion.h
index aeadac1321..c2886ecbb1 100644
--- a/repos/dde_linux/src/include/lx_emul/impl/completion.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/impl/completion.h
@@ -12,8 +12,8 @@
  */
 
 /* Linux kint includes */
-#include <lx_kit/env.h>
-#include <lx_kit/internal/task.h>
+#include <legacy/lx_kit/env.h>
+#include <legacy/lx_kit/internal/task.h>
 
 typedef Lx::Task::List_element Wait_le;
 typedef Lx::Task::List         Wait_list;
diff --git a/repos/dde_linux/src/include/lx_emul/impl/delay.h b/repos/dde_linux/src/include/legacy/lx_emul/impl/delay.h
similarity index 95%
rename from repos/dde_linux/src/include/lx_emul/impl/delay.h
rename to repos/dde_linux/src/include/legacy/lx_emul/impl/delay.h
index 523ed45fa6..03d5022885 100644
--- a/repos/dde_linux/src/include/lx_emul/impl/delay.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/impl/delay.h
@@ -23,8 +23,8 @@
 /* Genode includes */
 #include <timer_session/connection.h>
 
-#include <lx_kit/env.h>
-#include <lx_kit/timer.h>
+#include <legacy/lx_kit/env.h>
+#include <legacy/lx_kit/timer.h>
 
 /*
  * XXX  "We may consider to use the Lx::Timer instead of opening a dedicated
diff --git a/repos/dde_linux/src/include/lx_emul/impl/gfp.h b/repos/dde_linux/src/include/legacy/lx_emul/impl/gfp.h
similarity index 90%
rename from repos/dde_linux/src/include/lx_emul/impl/gfp.h
rename to repos/dde_linux/src/include/legacy/lx_emul/impl/gfp.h
index c418343022..035e649785 100644
--- a/repos/dde_linux/src/include/lx_emul/impl/gfp.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/impl/gfp.h
@@ -12,10 +12,10 @@
  */
 
 /* Linux kit includes */
-#include <lx_kit/addr_to_page_mapping.h>
-#include <lx_kit/backend_alloc.h>
-#include <lx_kit/malloc.h>
-#include <lx_kit/env.h>
+#include <legacy/lx_kit/addr_to_page_mapping.h>
+#include <legacy/lx_kit/backend_alloc.h>
+#include <legacy/lx_kit/malloc.h>
+#include <legacy/lx_kit/env.h>
 
 
 struct page *alloc_pages(gfp_t const gfp_mask, unsigned int order)
diff --git a/repos/dde_linux/src/include/lx_emul/impl/io.h b/repos/dde_linux/src/include/legacy/lx_emul/impl/io.h
similarity index 92%
rename from repos/dde_linux/src/include/lx_emul/impl/io.h
rename to repos/dde_linux/src/include/legacy/lx_emul/impl/io.h
index e1218d2ccf..335f4e54b4 100644
--- a/repos/dde_linux/src/include/lx_emul/impl/io.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/impl/io.h
@@ -12,8 +12,8 @@
  */
 
 /* Linux kit includes */
-#include <lx_kit/pci_dev_registry.h>
-#include <lx_kit/mapped_io_mem_range.h>
+#include <legacy/lx_kit/pci_dev_registry.h>
+#include <legacy/lx_kit/mapped_io_mem_range.h>
 
 
 void *ioremap(phys_addr_t phys_addr, unsigned long size)
diff --git a/repos/dde_linux/src/include/lx_emul/impl/kernel.h b/repos/dde_linux/src/include/legacy/lx_emul/impl/kernel.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/impl/kernel.h
rename to repos/dde_linux/src/include/legacy/lx_emul/impl/kernel.h
diff --git a/repos/dde_linux/src/include/lx_emul/impl/mutex.h b/repos/dde_linux/src/include/legacy/lx_emul/impl/mutex.h
similarity index 97%
rename from repos/dde_linux/src/include/lx_emul/impl/mutex.h
rename to repos/dde_linux/src/include/legacy/lx_emul/impl/mutex.h
index 745dce2885..9c165ae4ef 100644
--- a/repos/dde_linux/src/include/lx_emul/impl/mutex.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/impl/mutex.h
@@ -12,8 +12,8 @@
  */
 
 /* Linux kit includes */
-#include <lx_kit/scheduler.h>
-#include <lx_kit/env.h>
+#include <legacy/lx_kit/scheduler.h>
+#include <legacy/lx_kit/env.h>
 
 enum { MUTEX_UNLOCKED = 1, MUTEX_LOCKED = 0, MUTEX_WAITERS = -1 };
 
diff --git a/repos/dde_linux/src/include/lx_emul/impl/pci.h b/repos/dde_linux/src/include/legacy/lx_emul/impl/pci.h
similarity index 91%
rename from repos/dde_linux/src/include/lx_emul/impl/pci.h
rename to repos/dde_linux/src/include/legacy/lx_emul/impl/pci.h
index 39548fd57d..8272ea464f 100644
--- a/repos/dde_linux/src/include/lx_emul/impl/pci.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/impl/pci.h
@@ -12,11 +12,11 @@
  */
 
 /* Linux kit includes */
-#include <lx_kit/env.h>
-#include <lx_kit/pci_dev_registry.h>
-#include <lx_kit/mapped_io_mem_range.h>
+#include <legacy/lx_kit/env.h>
+#include <legacy/lx_kit/pci_dev_registry.h>
+#include <legacy/lx_kit/mapped_io_mem_range.h>
 
-#include <lx_emul/impl/pci_resource.h>
+#include <legacy/lx_emul/impl/pci_resource.h>
 
 
 extern "C" int pci_register_driver(struct pci_driver *driver)
diff --git a/repos/dde_linux/src/include/lx_emul/impl/pci_resource.h b/repos/dde_linux/src/include/legacy/lx_emul/impl/pci_resource.h
similarity index 96%
rename from repos/dde_linux/src/include/lx_emul/impl/pci_resource.h
rename to repos/dde_linux/src/include/legacy/lx_emul/impl/pci_resource.h
index 3c93025134..cb2a8edfbe 100644
--- a/repos/dde_linux/src/include/lx_emul/impl/pci_resource.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/impl/pci_resource.h
@@ -12,8 +12,8 @@
  */
 
 /* Linux kit includes */
-#include <lx_kit/pci_dev_registry.h>
-#include <lx_kit/mapped_io_mem_range.h>
+#include <legacy/lx_kit/pci_dev_registry.h>
+#include <legacy/lx_kit/mapped_io_mem_range.h>
 
 
 extern "C" size_t pci_resource_start(struct pci_dev *dev, unsigned bar)
diff --git a/repos/dde_linux/src/include/lx_emul/impl/sched.h b/repos/dde_linux/src/include/legacy/lx_emul/impl/sched.h
similarity index 96%
rename from repos/dde_linux/src/include/lx_emul/impl/sched.h
rename to repos/dde_linux/src/include/legacy/lx_emul/impl/sched.h
index 5ec8afaf09..84d963cef5 100644
--- a/repos/dde_linux/src/include/lx_emul/impl/sched.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/impl/sched.h
@@ -13,7 +13,7 @@
  */
 
 /* Linux kit includes */
-#include <lx_kit/scheduler.h>
+#include <legacy/lx_kit/scheduler.h>
 
 struct process_timer {
 	struct timer_list  timer;
diff --git a/repos/dde_linux/src/include/lx_emul/impl/slab.h b/repos/dde_linux/src/include/legacy/lx_emul/impl/slab.h
similarity index 99%
rename from repos/dde_linux/src/include/lx_emul/impl/slab.h
rename to repos/dde_linux/src/include/legacy/lx_emul/impl/slab.h
index 575b10a25d..2129b005b8 100644
--- a/repos/dde_linux/src/include/lx_emul/impl/slab.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/impl/slab.h
@@ -12,7 +12,7 @@
  */
 
 /* Linux kit includes */
-#include <lx_kit/malloc.h>
+#include <legacy/lx_kit/malloc.h>
 
 
 void *kmalloc(size_t size, gfp_t flags)
diff --git a/repos/dde_linux/src/include/lx_emul/impl/spinlock.h b/repos/dde_linux/src/include/legacy/lx_emul/impl/spinlock.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/impl/spinlock.h
rename to repos/dde_linux/src/include/legacy/lx_emul/impl/spinlock.h
diff --git a/repos/dde_linux/src/include/lx_emul/impl/timer.h b/repos/dde_linux/src/include/legacy/lx_emul/impl/timer.h
similarity index 98%
rename from repos/dde_linux/src/include/lx_emul/impl/timer.h
rename to repos/dde_linux/src/include/legacy/lx_emul/impl/timer.h
index 63e11d779d..377f3994d2 100644
--- a/repos/dde_linux/src/include/lx_emul/impl/timer.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/impl/timer.h
@@ -12,7 +12,7 @@
  */
 
 /* Linux kit includes */
-#include <lx_kit/timer.h>
+#include <legacy/lx_kit/timer.h>
 
 
 int mod_timer(struct timer_list *timer, unsigned long expires)
diff --git a/repos/dde_linux/src/include/lx_emul/impl/usb.h b/repos/dde_linux/src/include/legacy/lx_emul/impl/usb.h
similarity index 98%
rename from repos/dde_linux/src/include/lx_emul/impl/usb.h
rename to repos/dde_linux/src/include/legacy/lx_emul/impl/usb.h
index 7183651912..e4ff16a6c0 100644
--- a/repos/dde_linux/src/include/lx_emul/impl/usb.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/impl/usb.h
@@ -12,7 +12,7 @@
  */
 
 /* Linux kit includes */
-#include <lx_kit/usb.h>
+#include <legacy/lx_kit/usb.h>
 
 int usb_control_msg(struct usb_device *dev, unsigned int pipe,
                     __u8 request, __u8 requesttype, __u16 value,
diff --git a/repos/dde_linux/src/include/lx_emul/impl/wait.h b/repos/dde_linux/src/include/legacy/lx_emul/impl/wait.h
similarity index 95%
rename from repos/dde_linux/src/include/lx_emul/impl/wait.h
rename to repos/dde_linux/src/include/legacy/lx_emul/impl/wait.h
index 63aec1b3cc..c1e5d26902 100644
--- a/repos/dde_linux/src/include/lx_emul/impl/wait.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/impl/wait.h
@@ -12,7 +12,7 @@
  */
 
 /* Linux kit includes */
-#include <lx_kit/scheduler.h>
+#include <legacy/lx_kit/scheduler.h>
 
 
 void prepare_to_wait(wait_queue_head_t *q, wait_queue_entry_t *, int)
diff --git a/repos/dde_linux/src/include/lx_emul/impl/work.h b/repos/dde_linux/src/include/legacy/lx_emul/impl/work.h
similarity index 97%
rename from repos/dde_linux/src/include/lx_emul/impl/work.h
rename to repos/dde_linux/src/include/legacy/lx_emul/impl/work.h
index e03d4fbef8..d9caa13663 100644
--- a/repos/dde_linux/src/include/lx_emul/impl/work.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/impl/work.h
@@ -12,8 +12,8 @@
  */
 
 /* Linux kit includes */
-#include <lx_kit/scheduler.h>
-#include <lx_kit/work.h>
+#include <legacy/lx_kit/scheduler.h>
+#include <legacy/lx_kit/work.h>
 
 
 int schedule_work(struct work_struct *work)
diff --git a/repos/dde_linux/src/include/lx_emul/ioport.h b/repos/dde_linux/src/include/legacy/lx_emul/ioport.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/ioport.h
rename to repos/dde_linux/src/include/legacy/lx_emul/ioport.h
diff --git a/repos/dde_linux/src/include/lx_emul/irq.h b/repos/dde_linux/src/include/legacy/lx_emul/irq.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/irq.h
rename to repos/dde_linux/src/include/legacy/lx_emul/irq.h
diff --git a/repos/dde_linux/src/include/lx_emul/jiffies.h b/repos/dde_linux/src/include/legacy/lx_emul/jiffies.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/jiffies.h
rename to repos/dde_linux/src/include/legacy/lx_emul/jiffies.h
diff --git a/repos/dde_linux/src/include/lx_emul/kernel.h b/repos/dde_linux/src/include/legacy/lx_emul/kernel.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/kernel.h
rename to repos/dde_linux/src/include/legacy/lx_emul/kernel.h
diff --git a/repos/dde_linux/src/include/lx_emul/kobject.h b/repos/dde_linux/src/include/legacy/lx_emul/kobject.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/kobject.h
rename to repos/dde_linux/src/include/legacy/lx_emul/kobject.h
diff --git a/repos/dde_linux/src/include/lx_emul/list.h b/repos/dde_linux/src/include/legacy/lx_emul/list.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/list.h
rename to repos/dde_linux/src/include/legacy/lx_emul/list.h
diff --git a/repos/dde_linux/src/include/lx_emul/mmio.h b/repos/dde_linux/src/include/legacy/lx_emul/mmio.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/mmio.h
rename to repos/dde_linux/src/include/legacy/lx_emul/mmio.h
diff --git a/repos/dde_linux/src/include/lx_emul/module.h b/repos/dde_linux/src/include/legacy/lx_emul/module.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/module.h
rename to repos/dde_linux/src/include/legacy/lx_emul/module.h
diff --git a/repos/dde_linux/src/include/lx_emul/mutex.h b/repos/dde_linux/src/include/legacy/lx_emul/mutex.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/mutex.h
rename to repos/dde_linux/src/include/legacy/lx_emul/mutex.h
diff --git a/repos/dde_linux/src/include/lx_emul/pci.h b/repos/dde_linux/src/include/legacy/lx_emul/pci.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/pci.h
rename to repos/dde_linux/src/include/legacy/lx_emul/pci.h
diff --git a/repos/dde_linux/src/include/lx_emul/pm.h b/repos/dde_linux/src/include/legacy/lx_emul/pm.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/pm.h
rename to repos/dde_linux/src/include/legacy/lx_emul/pm.h
diff --git a/repos/dde_linux/src/include/lx_emul/printf.h b/repos/dde_linux/src/include/legacy/lx_emul/printf.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/printf.h
rename to repos/dde_linux/src/include/legacy/lx_emul/printf.h
diff --git a/repos/dde_linux/src/include/lx_emul/scatterlist.h b/repos/dde_linux/src/include/legacy/lx_emul/scatterlist.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/scatterlist.h
rename to repos/dde_linux/src/include/legacy/lx_emul/scatterlist.h
diff --git a/repos/dde_linux/src/include/lx_emul/semaphore.h b/repos/dde_linux/src/include/legacy/lx_emul/semaphore.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/semaphore.h
rename to repos/dde_linux/src/include/legacy/lx_emul/semaphore.h
diff --git a/repos/dde_linux/src/include/lx_emul/spinlock.h b/repos/dde_linux/src/include/legacy/lx_emul/spinlock.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/spinlock.h
rename to repos/dde_linux/src/include/legacy/lx_emul/spinlock.h
diff --git a/repos/dde_linux/src/include/lx_emul/string.h b/repos/dde_linux/src/include/legacy/lx_emul/string.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/string.h
rename to repos/dde_linux/src/include/legacy/lx_emul/string.h
diff --git a/repos/dde_linux/src/include/lx_emul/time.h b/repos/dde_linux/src/include/legacy/lx_emul/time.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/time.h
rename to repos/dde_linux/src/include/legacy/lx_emul/time.h
diff --git a/repos/dde_linux/src/include/lx_emul/timer.h b/repos/dde_linux/src/include/legacy/lx_emul/timer.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/timer.h
rename to repos/dde_linux/src/include/legacy/lx_emul/timer.h
diff --git a/repos/dde_linux/src/include/lx_emul/types.h b/repos/dde_linux/src/include/legacy/lx_emul/types.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/types.h
rename to repos/dde_linux/src/include/legacy/lx_emul/types.h
diff --git a/repos/dde_linux/src/include/lx_emul/work.h b/repos/dde_linux/src/include/legacy/lx_emul/work.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_emul/work.h
rename to repos/dde_linux/src/include/legacy/lx_emul/work.h
diff --git a/repos/dde_linux/src/include/lx_kit/addr_to_page_mapping.h b/repos/dde_linux/src/include/legacy/lx_kit/addr_to_page_mapping.h
similarity index 96%
rename from repos/dde_linux/src/include/lx_kit/addr_to_page_mapping.h
rename to repos/dde_linux/src/include/legacy/lx_kit/addr_to_page_mapping.h
index bae6133b47..83ed0244e7 100644
--- a/repos/dde_linux/src/include/lx_kit/addr_to_page_mapping.h
+++ b/repos/dde_linux/src/include/legacy/lx_kit/addr_to_page_mapping.h
@@ -17,8 +17,8 @@
 #define _LX_KIT__ADDR_TO_PAGE_MAPPING_H_
 
 /* Linux emulation environment includes */
-#include <lx_kit/internal/list.h>
-#include <lx_kit/malloc.h>
+#include <legacy/lx_kit/internal/list.h>
+#include <legacy/lx_kit/malloc.h>
 
 namespace Lx { class Addr_to_page_mapping; }
 
diff --git a/repos/dde_linux/src/include/lx_kit/backend_alloc.h b/repos/dde_linux/src/include/legacy/lx_kit/backend_alloc.h
similarity index 94%
rename from repos/dde_linux/src/include/lx_kit/backend_alloc.h
rename to repos/dde_linux/src/include/legacy/lx_kit/backend_alloc.h
index 9e5dff8dd3..a59e78b0d2 100644
--- a/repos/dde_linux/src/include/lx_kit/backend_alloc.h
+++ b/repos/dde_linux/src/include/legacy/lx_kit/backend_alloc.h
@@ -18,7 +18,7 @@
 #define _LX_KIT__BACKEND_ALLOC_H_
 
 /* Linux emulation environment includes */
-#include <lx_kit/types.h>
+#include <legacy/lx_kit/types.h>
 
 
 namespace Lx {
diff --git a/repos/dde_linux/src/include/lx_kit/env.h b/repos/dde_linux/src/include/legacy/lx_kit/env.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_kit/env.h
rename to repos/dde_linux/src/include/legacy/lx_kit/env.h
diff --git a/repos/dde_linux/src/include/lx_kit/internal/io_port.h b/repos/dde_linux/src/include/legacy/lx_kit/internal/io_port.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_kit/internal/io_port.h
rename to repos/dde_linux/src/include/legacy/lx_kit/internal/io_port.h
diff --git a/repos/dde_linux/src/include/lx_kit/internal/list.h b/repos/dde_linux/src/include/legacy/lx_kit/internal/list.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_kit/internal/list.h
rename to repos/dde_linux/src/include/legacy/lx_kit/internal/list.h
diff --git a/repos/dde_linux/src/include/lx_kit/internal/pci_dev.h b/repos/dde_linux/src/include/legacy/lx_kit/internal/pci_dev.h
similarity index 98%
rename from repos/dde_linux/src/include/lx_kit/internal/pci_dev.h
rename to repos/dde_linux/src/include/legacy/lx_kit/internal/pci_dev.h
index 3efc49f03b..8806063b90 100644
--- a/repos/dde_linux/src/include/lx_kit/internal/pci_dev.h
+++ b/repos/dde_linux/src/include/legacy/lx_kit/internal/pci_dev.h
@@ -25,8 +25,8 @@
 #include <util/retry.h>
 
 /* Linux emulation environment includes */
-#include <lx_kit/internal/list.h>
-#include <lx_kit/internal/io_port.h>
+#include <legacy/lx_kit/internal/list.h>
+#include <legacy/lx_kit/internal/io_port.h>
 
 namespace Lx {
 
diff --git a/repos/dde_linux/src/include/lx_kit/internal/slab_alloc.h b/repos/dde_linux/src/include/legacy/lx_kit/internal/slab_alloc.h
similarity index 94%
rename from repos/dde_linux/src/include/lx_kit/internal/slab_alloc.h
rename to repos/dde_linux/src/include/legacy/lx_kit/internal/slab_alloc.h
index 77a56d6aa3..f081c32883 100644
--- a/repos/dde_linux/src/include/lx_kit/internal/slab_alloc.h
+++ b/repos/dde_linux/src/include/legacy/lx_kit/internal/slab_alloc.h
@@ -21,8 +21,8 @@
 #include <util/misc_math.h>
 
 /* Linux emulation environment includes */
-#include <lx_kit/internal/slab_backend_alloc.h>
-#include <lx_kit/types.h>
+#include <legacy/lx_kit/internal/slab_backend_alloc.h>
+#include <legacy/lx_kit/types.h>
 
 namespace Lx { class Slab_alloc; }
 
diff --git a/repos/dde_linux/src/include/lx_kit/internal/slab_backend_alloc.h b/repos/dde_linux/src/include/legacy/lx_kit/internal/slab_backend_alloc.h
similarity index 97%
rename from repos/dde_linux/src/include/lx_kit/internal/slab_backend_alloc.h
rename to repos/dde_linux/src/include/legacy/lx_kit/internal/slab_backend_alloc.h
index 7364dff6bf..d6e63f4c9d 100644
--- a/repos/dde_linux/src/include/lx_kit/internal/slab_backend_alloc.h
+++ b/repos/dde_linux/src/include/legacy/lx_kit/internal/slab_backend_alloc.h
@@ -21,7 +21,7 @@
 #include <base/allocator_avl.h>
 
 /* Linux emulation environment includes */
-#include <lx_kit/types.h>
+#include <legacy/lx_kit/types.h>
 
 
 namespace Lx {
diff --git a/repos/dde_linux/src/include/lx_kit/internal/task.h b/repos/dde_linux/src/include/legacy/lx_kit/internal/task.h
similarity index 98%
rename from repos/dde_linux/src/include/lx_kit/internal/task.h
rename to repos/dde_linux/src/include/legacy/lx_kit/internal/task.h
index b680499e0f..b8cd5fd6fb 100644
--- a/repos/dde_linux/src/include/lx_kit/internal/task.h
+++ b/repos/dde_linux/src/include/legacy/lx_kit/internal/task.h
@@ -22,8 +22,8 @@
 #include <base/sleep.h>
 
 /* Linux emulation environment includes */
-#include <lx_kit/internal/list.h>
-#include <lx_kit/internal/arch_execute.h>
+#include <legacy/lx_kit/internal/list.h>
+#include <legacy/lx_kit/internal/arch_execute.h>
 
 
 namespace Lx {
diff --git a/repos/dde_linux/src/include/lx_kit/irq.h b/repos/dde_linux/src/include/legacy/lx_kit/irq.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_kit/irq.h
rename to repos/dde_linux/src/include/legacy/lx_kit/irq.h
diff --git a/repos/dde_linux/src/include/lx_kit/malloc.h b/repos/dde_linux/src/include/legacy/lx_kit/malloc.h
similarity index 92%
rename from repos/dde_linux/src/include/lx_kit/malloc.h
rename to repos/dde_linux/src/include/legacy/lx_kit/malloc.h
index d9b08bbe33..b2da2bdddb 100644
--- a/repos/dde_linux/src/include/lx_kit/malloc.h
+++ b/repos/dde_linux/src/include/legacy/lx_kit/malloc.h
@@ -17,9 +17,9 @@
 #define _LX_KIT__MALLOC_H_
 
 /* Linux emulation environment includes */
-#include <lx_kit/types.h>
-#include <lx_kit/internal/slab_alloc.h>
-#include <lx_kit/internal/slab_backend_alloc.h>
+#include <legacy/lx_kit/types.h>
+#include <legacy/lx_kit/internal/slab_alloc.h>
+#include <legacy/lx_kit/internal/slab_backend_alloc.h>
 
 
 namespace Lx {
diff --git a/repos/dde_linux/src/include/lx_kit/mapped_io_mem_range.h b/repos/dde_linux/src/include/legacy/lx_kit/mapped_io_mem_range.h
similarity index 95%
rename from repos/dde_linux/src/include/lx_kit/mapped_io_mem_range.h
rename to repos/dde_linux/src/include/legacy/lx_kit/mapped_io_mem_range.h
index e1d13d1fa2..e7faebcd69 100644
--- a/repos/dde_linux/src/include/lx_kit/mapped_io_mem_range.h
+++ b/repos/dde_linux/src/include/legacy/lx_kit/mapped_io_mem_range.h
@@ -18,7 +18,7 @@
 #include <dataspace/capability.h>
 
 /* Linux emulation environment includes */
-#include <lx_kit/types.h>
+#include <legacy/lx_kit/types.h>
 
 namespace Lx {
 
diff --git a/repos/dde_linux/src/include/lx_kit/pci.h b/repos/dde_linux/src/include/legacy/lx_kit/pci.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_kit/pci.h
rename to repos/dde_linux/src/include/legacy/lx_kit/pci.h
diff --git a/repos/dde_linux/src/include/lx_kit/pci_dev_registry.h b/repos/dde_linux/src/include/legacy/lx_kit/pci_dev_registry.h
similarity index 98%
rename from repos/dde_linux/src/include/lx_kit/pci_dev_registry.h
rename to repos/dde_linux/src/include/legacy/lx_kit/pci_dev_registry.h
index 43a2f0eb38..063fd23d47 100644
--- a/repos/dde_linux/src/include/lx_kit/pci_dev_registry.h
+++ b/repos/dde_linux/src/include/legacy/lx_kit/pci_dev_registry.h
@@ -15,8 +15,8 @@
 #define _LX_KIT__PCI_DEV_REGISTRY_H_
 
 /* Linux emulation environment includes */
-#include <lx_kit/pci.h>
-#include <lx_kit/internal/pci_dev.h>
+#include <legacy/lx_kit/pci.h>
+#include <legacy/lx_kit/internal/pci_dev.h>
 #include <io_port_session/connection.h>
 
 namespace Lx {
diff --git a/repos/dde_linux/src/include/lx_kit/scheduler.h b/repos/dde_linux/src/include/legacy/lx_kit/scheduler.h
similarity index 96%
rename from repos/dde_linux/src/include/lx_kit/scheduler.h
rename to repos/dde_linux/src/include/legacy/lx_kit/scheduler.h
index 90308ed7dc..02312b7441 100644
--- a/repos/dde_linux/src/include/lx_kit/scheduler.h
+++ b/repos/dde_linux/src/include/legacy/lx_kit/scheduler.h
@@ -72,7 +72,7 @@ class Lx::Scheduler
 		virtual void log_state(char const *prefix) = 0;
 };
 
-#include <lx_kit/internal/task.h>
+#include <legacy/lx_kit/internal/task.h>
 
 
 #endif /* _LX_KIT__SCHEDULER_H_ */
diff --git a/repos/dde_linux/src/include/lx_kit/timer.h b/repos/dde_linux/src/include/legacy/lx_kit/timer.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_kit/timer.h
rename to repos/dde_linux/src/include/legacy/lx_kit/timer.h
diff --git a/repos/dde_linux/src/include/lx_kit/types.h b/repos/dde_linux/src/include/legacy/lx_kit/types.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_kit/types.h
rename to repos/dde_linux/src/include/legacy/lx_kit/types.h
diff --git a/repos/dde_linux/src/include/lx_kit/usb.h b/repos/dde_linux/src/include/legacy/lx_kit/usb.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_kit/usb.h
rename to repos/dde_linux/src/include/legacy/lx_kit/usb.h
diff --git a/repos/dde_linux/src/include/lx_kit/work.h b/repos/dde_linux/src/include/legacy/lx_kit/work.h
similarity index 100%
rename from repos/dde_linux/src/include/lx_kit/work.h
rename to repos/dde_linux/src/include/legacy/lx_kit/work.h
diff --git a/repos/dde_linux/src/include/spec/arm/lx_kit/internal/arch_execute.h b/repos/dde_linux/src/include/spec/arm/legacy/lx_kit/internal/arch_execute.h
similarity index 100%
rename from repos/dde_linux/src/include/spec/arm/lx_kit/internal/arch_execute.h
rename to repos/dde_linux/src/include/spec/arm/legacy/lx_kit/internal/arch_execute.h
diff --git a/repos/dde_linux/src/include/spec/arm_64/lx_emul/barrier.h b/repos/dde_linux/src/include/spec/arm_64/legacy/lx_emul/barrier.h
similarity index 100%
rename from repos/dde_linux/src/include/spec/arm_64/lx_emul/barrier.h
rename to repos/dde_linux/src/include/spec/arm_64/legacy/lx_emul/barrier.h
diff --git a/repos/dde_linux/src/include/spec/arm_64/lx_kit/internal/arch_execute.h b/repos/dde_linux/src/include/spec/arm_64/legacy/lx_kit/internal/arch_execute.h
similarity index 100%
rename from repos/dde_linux/src/include/spec/arm_64/lx_kit/internal/arch_execute.h
rename to repos/dde_linux/src/include/spec/arm_64/legacy/lx_kit/internal/arch_execute.h
diff --git a/repos/dde_linux/src/include/spec/arm_v6/lx_emul/barrier.h b/repos/dde_linux/src/include/spec/arm_v6/legacy/lx_emul/barrier.h
similarity index 100%
rename from repos/dde_linux/src/include/spec/arm_v6/lx_emul/barrier.h
rename to repos/dde_linux/src/include/spec/arm_v6/legacy/lx_emul/barrier.h
diff --git a/repos/dde_linux/src/include/spec/arm_v7/lx_emul/barrier.h b/repos/dde_linux/src/include/spec/arm_v7/legacy/lx_emul/barrier.h
similarity index 100%
rename from repos/dde_linux/src/include/spec/arm_v7/lx_emul/barrier.h
rename to repos/dde_linux/src/include/spec/arm_v7/legacy/lx_emul/barrier.h
diff --git a/repos/dde_linux/src/include/spec/x86/lx_emul/barrier.h b/repos/dde_linux/src/include/spec/x86/legacy/lx_emul/barrier.h
similarity index 100%
rename from repos/dde_linux/src/include/spec/x86/lx_emul/barrier.h
rename to repos/dde_linux/src/include/spec/x86/legacy/lx_emul/barrier.h
diff --git a/repos/dde_linux/src/include/spec/x86_32/lx_kit/internal/arch_execute.h b/repos/dde_linux/src/include/spec/x86_32/legacy/lx_kit/internal/arch_execute.h
similarity index 100%
rename from repos/dde_linux/src/include/spec/x86_32/lx_kit/internal/arch_execute.h
rename to repos/dde_linux/src/include/spec/x86_32/legacy/lx_kit/internal/arch_execute.h
diff --git a/repos/dde_linux/src/include/spec/x86_64/lx_kit/internal/arch_execute.h b/repos/dde_linux/src/include/spec/x86_64/legacy/lx_kit/internal/arch_execute.h
similarity index 100%
rename from repos/dde_linux/src/include/spec/x86_64/lx_kit/internal/arch_execute.h
rename to repos/dde_linux/src/include/spec/x86_64/legacy/lx_kit/internal/arch_execute.h
diff --git a/repos/dde_linux/src/lx_kit/bug.cc b/repos/dde_linux/src/lib/legacy/lx_kit/bug.cc
similarity index 77%
rename from repos/dde_linux/src/lx_kit/bug.cc
rename to repos/dde_linux/src/lib/legacy/lx_kit/bug.cc
index f08bd6436c..59df545cad 100644
--- a/repos/dde_linux/src/lx_kit/bug.cc
+++ b/repos/dde_linux/src/lib/legacy/lx_kit/bug.cc
@@ -15,9 +15,9 @@
 #include <base/sleep.h>
 
 /* Linux emulation environment includes */
-#include <lx_emul/extern_c_begin.h>
-#include <lx_emul/bug.h>
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/bug.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 
 extern "C" void lx_sleep_forever()
diff --git a/repos/dde_linux/src/lx_kit/env.cc b/repos/dde_linux/src/lib/legacy/lx_kit/env.cc
similarity index 93%
rename from repos/dde_linux/src/lx_kit/env.cc
rename to repos/dde_linux/src/lib/legacy/lx_kit/env.cc
index 9595c00f84..a0811f763d 100644
--- a/repos/dde_linux/src/lx_kit/env.cc
+++ b/repos/dde_linux/src/lib/legacy/lx_kit/env.cc
@@ -11,7 +11,7 @@
  * version 2.
  */
 
-#include <lx_kit/env.h>
+#include <legacy/lx_kit/env.h>
 
 static Lx_kit::Env *_env_ptr;
 
diff --git a/repos/dde_linux/src/lx_kit/irq.cc b/repos/dde_linux/src/lib/legacy/lx_kit/irq.cc
similarity index 98%
rename from repos/dde_linux/src/lx_kit/irq.cc
rename to repos/dde_linux/src/lib/legacy/lx_kit/irq.cc
index 85ea47a7b7..43401a39bd 100644
--- a/repos/dde_linux/src/lx_kit/irq.cc
+++ b/repos/dde_linux/src/lib/legacy/lx_kit/irq.cc
@@ -23,8 +23,8 @@
 #include <lx_emul.h>
 
 /* Linux kit includes */
-#include <lx_kit/irq.h>
-#include <lx_kit/scheduler.h>
+#include <legacy/lx_kit/irq.h>
+#include <legacy/lx_kit/scheduler.h>
 
 
 namespace Lx_kit { class Irq; }
diff --git a/repos/dde_linux/src/lx_kit/malloc.cc b/repos/dde_linux/src/lib/legacy/lx_kit/malloc.cc
similarity index 98%
rename from repos/dde_linux/src/lx_kit/malloc.cc
rename to repos/dde_linux/src/lib/legacy/lx_kit/malloc.cc
index eab6aa91b8..77b715eb7f 100644
--- a/repos/dde_linux/src/lx_kit/malloc.cc
+++ b/repos/dde_linux/src/lib/legacy/lx_kit/malloc.cc
@@ -22,9 +22,9 @@
 #include <region_map/client.h>
 
 /* Linux kit includes */
-#include <lx_kit/types.h>
-#include <lx_kit/backend_alloc.h>
-#include <lx_kit/malloc.h>
+#include <legacy/lx_kit/types.h>
+#include <legacy/lx_kit/backend_alloc.h>
+#include <legacy/lx_kit/malloc.h>
 
 
 namespace Lx_kit {
diff --git a/repos/dde_linux/src/lx_kit/mapped_io_mem_range.cc b/repos/dde_linux/src/lib/legacy/lx_kit/mapped_io_mem_range.cc
similarity index 95%
rename from repos/dde_linux/src/lx_kit/mapped_io_mem_range.cc
rename to repos/dde_linux/src/lib/legacy/lx_kit/mapped_io_mem_range.cc
index aab90ad1a6..b5558f4907 100644
--- a/repos/dde_linux/src/lx_kit/mapped_io_mem_range.cc
+++ b/repos/dde_linux/src/lib/legacy/lx_kit/mapped_io_mem_range.cc
@@ -21,11 +21,11 @@
 #include <lx_emul.h>
 
 /* Linux emulation environment includes */
-#include <lx_kit/env.h>
-#include <lx_kit/internal/list.h>
-#include <lx_kit/mapped_io_mem_range.h>
-#include <lx_kit/pci_dev_registry.h>
-#include <lx_kit/types.h>
+#include <legacy/lx_kit/env.h>
+#include <legacy/lx_kit/internal/list.h>
+#include <legacy/lx_kit/mapped_io_mem_range.h>
+#include <legacy/lx_kit/pci_dev_registry.h>
+#include <legacy/lx_kit/types.h>
 
 namespace Lx_kit { class Mapped_io_mem_range; }
 
diff --git a/repos/dde_linux/src/lx_kit/pci.cc b/repos/dde_linux/src/lib/legacy/lx_kit/pci.cc
similarity index 97%
rename from repos/dde_linux/src/lx_kit/pci.cc
rename to repos/dde_linux/src/lib/legacy/lx_kit/pci.cc
index 6e194125c0..7b9ab7a317 100644
--- a/repos/dde_linux/src/lx_kit/pci.cc
+++ b/repos/dde_linux/src/lib/legacy/lx_kit/pci.cc
@@ -21,8 +21,8 @@
 #include <lx_emul.h>
 
 /* Linux emulation environment includes */
-#include <lx_kit/backend_alloc.h>
-#include <lx_kit/pci_dev_registry.h>
+#include <legacy/lx_kit/backend_alloc.h>
+#include <legacy/lx_kit/pci_dev_registry.h>
 
 
 namespace Lx_kit {
diff --git a/repos/dde_linux/src/lx_kit/printf.cc b/repos/dde_linux/src/lib/legacy/lx_kit/printf.cc
similarity index 100%
rename from repos/dde_linux/src/lx_kit/printf.cc
rename to repos/dde_linux/src/lib/legacy/lx_kit/printf.cc
diff --git a/repos/dde_linux/src/lx_kit/scheduler.cc b/repos/dde_linux/src/lib/legacy/lx_kit/scheduler.cc
similarity index 98%
rename from repos/dde_linux/src/lx_kit/scheduler.cc
rename to repos/dde_linux/src/lib/legacy/lx_kit/scheduler.cc
index 8205364f35..ffc5b5c19b 100644
--- a/repos/dde_linux/src/lx_kit/scheduler.cc
+++ b/repos/dde_linux/src/lib/legacy/lx_kit/scheduler.cc
@@ -21,9 +21,9 @@
 #include <timer_session/connection.h>
 
 /* Linux emulation environment includes */
-#include <lx_kit/scheduler.h>
+#include <legacy/lx_kit/scheduler.h>
 
-#include <lx_kit/timer.h>
+#include <legacy/lx_kit/timer.h>
 
 
 namespace Lx_kit {
diff --git a/repos/dde_linux/src/lx_kit/spec/arm/setjmp.S b/repos/dde_linux/src/lib/legacy/lx_kit/spec/arm/setjmp.S
similarity index 100%
rename from repos/dde_linux/src/lx_kit/spec/arm/setjmp.S
rename to repos/dde_linux/src/lib/legacy/lx_kit/spec/arm/setjmp.S
diff --git a/repos/dde_linux/src/lx_kit/spec/arm_64/setjmp.S b/repos/dde_linux/src/lib/legacy/lx_kit/spec/arm_64/setjmp.S
similarity index 100%
rename from repos/dde_linux/src/lx_kit/spec/arm_64/setjmp.S
rename to repos/dde_linux/src/lib/legacy/lx_kit/spec/arm_64/setjmp.S
diff --git a/repos/dde_linux/src/lx_kit/spec/x86_32/setjmp.S b/repos/dde_linux/src/lib/legacy/lx_kit/spec/x86_32/setjmp.S
similarity index 100%
rename from repos/dde_linux/src/lx_kit/spec/x86_32/setjmp.S
rename to repos/dde_linux/src/lib/legacy/lx_kit/spec/x86_32/setjmp.S
diff --git a/repos/dde_linux/src/lx_kit/spec/x86_64/setjmp.S b/repos/dde_linux/src/lib/legacy/lx_kit/spec/x86_64/setjmp.S
similarity index 100%
rename from repos/dde_linux/src/lx_kit/spec/x86_64/setjmp.S
rename to repos/dde_linux/src/lib/legacy/lx_kit/spec/x86_64/setjmp.S
diff --git a/repos/dde_linux/src/lx_kit/timer.cc b/repos/dde_linux/src/lib/legacy/lx_kit/timer.cc
similarity index 98%
rename from repos/dde_linux/src/lx_kit/timer.cc
rename to repos/dde_linux/src/lib/legacy/lx_kit/timer.cc
index 705c24aa29..e87bea96c6 100644
--- a/repos/dde_linux/src/lx_kit/timer.cc
+++ b/repos/dde_linux/src/lib/legacy/lx_kit/timer.cc
@@ -18,13 +18,13 @@
 #include <timer_session/connection.h>
 
 /* Linux kit includes */
-#include <lx_kit/internal/list.h>
-#include <lx_kit/scheduler.h>
+#include <legacy/lx_kit/internal/list.h>
+#include <legacy/lx_kit/scheduler.h>
 
 /* Linux emulation environment includes */
 #include <lx_emul.h>
 
-#include <lx_kit/timer.h>
+#include <legacy/lx_kit/timer.h>
 
 
 namespace Lx_kit { class Timer; }
diff --git a/repos/dde_linux/src/lx_kit/work.cc b/repos/dde_linux/src/lib/legacy/lx_kit/work.cc
similarity index 97%
rename from repos/dde_linux/src/lx_kit/work.cc
rename to repos/dde_linux/src/lib/legacy/lx_kit/work.cc
index 68867bf253..2c99b4af4d 100644
--- a/repos/dde_linux/src/lx_kit/work.cc
+++ b/repos/dde_linux/src/lib/legacy/lx_kit/work.cc
@@ -15,13 +15,13 @@
 /* Genode includes */
 #include <base/tslab.h>
 
-#include <lx_kit/internal/list.h>
-#include <lx_kit/scheduler.h>
+#include <legacy/lx_kit/internal/list.h>
+#include <legacy/lx_kit/scheduler.h>
 
 /* Linux emulation environment includes */
 #include <lx_emul.h>
 
-#include <lx_kit/work.h>
+#include <legacy/lx_kit/work.h>
 
 
 namespace Lx_kit { class Work; }
diff --git a/repos/dde_linux/src/lib/lxip/include/lx_emul.h b/repos/dde_linux/src/lib/lxip/include/lx_emul.h
index c5855f0200..502b098d45 100644
--- a/repos/dde_linux/src/lib/lxip/include/lx_emul.h
+++ b/repos/dde_linux/src/lib/lxip/include/lx_emul.h
@@ -20,7 +20,7 @@
 #include <stdarg.h>
 #include <base/fixed_stdint.h>
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 
 #define DEBUG_PRINTK 1
 #define DEBUG_SLAB   0
@@ -41,14 +41,14 @@ enum { HZ = 100UL };
  ** asm/atomic.h **
  ******************/
 
-#include <lx_emul/atomic.h>
+#include <legacy/lx_emul/atomic.h>
 
 
 /*******************
  ** linux/types.h **
  *******************/
 
-#include <lx_emul/types.h>
+#include <legacy/lx_emul/types.h>
 
 typedef __u8  u_int8_t;
 
@@ -71,14 +71,14 @@ typedef __u32 __wsum;
  ** linux/compiler.h **
  **********************/
 
-#include <lx_emul/compiler.h>
+#include <legacy/lx_emul/compiler.h>
 
 
 /**************************
  ** asm-generic/bitops.h **
  **************************/
 
-#include <lx_emul/bitops.h>
+#include <legacy/lx_emul/bitops.h>
 
 #define ffz(x) __ffs(~(x))
 
@@ -142,14 +142,14 @@ struct callback_head {
  ** linux/errno.h and friends **
  *******************************/
 
-#include <lx_emul/errno.h>
+#include <legacy/lx_emul/errno.h>
 
 
 /********************
  ** linux/module.h **
  ********************/
 
-#include <lx_emul/module.h>
+#include <legacy/lx_emul/module.h>
 
 #ifdef __setup
 #undef __setup
@@ -171,7 +171,7 @@ struct callback_head {
  ** asm/barrier.h **
  *******************/
 
-#include <lx_emul/barrier.h>
+#include <legacy/lx_emul/barrier.h>
 
 #define smp_load_acquire(p)     *(p)
 #define smp_store_release(p, v) *(p) = v;
@@ -190,7 +190,7 @@ struct callback_head {
  ** linux/compiler.h **
  **********************/
 
-#include <lx_emul/compiler.h>
+#include <legacy/lx_emul/compiler.h>
 
 #define __deprecated
 
@@ -241,14 +241,14 @@ static inline void __read_once_size(const volatile void *p, void *res, int size)
  ** asm/bug.h **
  ***************/
 
-#include <lx_emul/bug.h>
+#include <legacy/lx_emul/bug.h>
 
 
 /********************
  ** linux/printk.h **
  ********************/
 
-#include <lx_emul/printf.h>
+#include <legacy/lx_emul/printf.h>
 
 #define pr_crit(fmt, ...)       lx_printf(KERN_CRIT fmt, ##__VA_ARGS__)
 #define pr_emerg(fmt, ...)      lx_printf(KERN_EMERG fmt, ##__VA_ARGS__)
@@ -274,7 +274,7 @@ static inline __printf(1, 2) int no_printk(const char *fmt, ...) { return 0; }
  ** linux/kernel.h **
  ********************/
 
-#include <lx_emul/kernel.h>
+#include <legacy/lx_emul/kernel.h>
 
 #define KERN_CONT   ""
 
@@ -325,7 +325,7 @@ int kstrtou8(const char *s, unsigned int base, u8 *res);
  ** linux/jiffies.h **
  *********************/
 
-#include <lx_emul/jiffies.h>
+#include <legacy/lx_emul/jiffies.h>
 
 enum {
 	INITIAL_JIFFIES = 0,
@@ -407,7 +407,7 @@ void *current_text_addr(void);
  ** linux/byteorder/little_endian.h **
  *************************************/
 
-#include <lx_emul/byteorder.h>
+#include <legacy/lx_emul/byteorder.h>
 
 #define htons(x) __cpu_to_be16(x)
 #define ntohs(x) __be16_to_cpu(x)
@@ -559,7 +559,7 @@ bool static_key_enabled(struct static_key *);
  ** linux/poison.h **
  ********************/
 
-#include <lx_emul/list.h>
+#include <legacy/lx_emul/list.h>
 
 
 /****************
@@ -760,7 +760,7 @@ unsigned long nr_free_buffer_pages(void);
  ** linux/gfp.h **
  *****************/
 
-#include <lx_emul/gfp.h>
+#include <legacy/lx_emul/gfp.h>
 
 enum {
 	__GFP_COLD   = 0x00000100u,
@@ -868,14 +868,14 @@ void debug_check_no_locks_freed(const void *from, unsigned long len);
  ** linux/spinlock.h **
  **********************/
 
-#include <lx_emul/spinlock.h>
+#include <legacy/lx_emul/spinlock.h>
 
 
 /*******************
  ** linux/mutex.h **
  *******************/
 
-#include <lx_emul/mutex.h>
+#include <legacy/lx_emul/mutex.h>
 
 LX_MUTEX_INIT_DECLARE(dst_gc_mutex);
 LX_MUTEX_INIT_DECLARE(proto_list_mutex);
@@ -912,7 +912,7 @@ void read_unlock_bh(rwlock_t *);
  ** linux/rwsem.h **
  *******************/
 
-#include <lx_emul/semaphore.h>
+#include <legacy/lx_emul/semaphore.h>
 
 
 /*********************
@@ -1501,7 +1501,7 @@ void local_bh_enable(void);
  ** linux/string.h **
  ********************/
 
-#include <lx_emul/string.h>
+#include <legacy/lx_emul/string.h>
 
 char *strnchr(const char *, size_t, int);
 
@@ -1727,7 +1727,7 @@ enum {
  ** linux/workqueue.h **
  ***********************/
 
-#include <lx_emul/work.h>
+#include <legacy/lx_emul/work.h>
 
 #define wait_queue_t wait_queue_entry_t
 
@@ -3439,6 +3439,6 @@ void log_sock(struct socket *sock);
 
 void lx_trace_event(char const *, ...) __attribute__((format(printf, 1, 2)));
 
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 #endif /* _LX_EMUL_H_ */
diff --git a/repos/dde_linux/src/lib/lxip/include/msghdr.h b/repos/dde_linux/src/lib/lxip/include/msghdr.h
index f63ef6f6a5..bbd43ebc23 100644
--- a/repos/dde_linux/src/lib/lxip/include/msghdr.h
+++ b/repos/dde_linux/src/lib/lxip/include/msghdr.h
@@ -14,9 +14,9 @@
 #ifndef _MSGHDR_H_
 #define _MSGHDR_H_
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 #include <linux/socket.h>
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 
 static inline msghdr create_msghdr(void *name, int namelen, size_t datalen,
diff --git a/repos/dde_linux/src/lib/lxip/lxcc_emul.cc b/repos/dde_linux/src/lib/lxip/lxcc_emul.cc
index 4ed2b0859f..63ba10fc46 100644
--- a/repos/dde_linux/src/lib/lxip/lxcc_emul.cc
+++ b/repos/dde_linux/src/lib/lxip/lxcc_emul.cc
@@ -29,13 +29,13 @@
 
 
 /* Lx_kit */
-#include <lx_kit/env.h>
+#include <legacy/lx_kit/env.h>
 
 /*********************************
  ** Lx::Backend_alloc interface **
  *********************************/
 
-#include <lx_kit/backend_alloc.h>
+#include <legacy/lx_kit/backend_alloc.h>
 
 struct Memory_object_base;
 
@@ -106,7 +106,7 @@ void Lx::backend_free(Genode::Ram_dataspace_capability cap)
  ** Memory allocation, linux/slab.h **
  *************************************/
 
-#include <lx_emul/impl/slab.h>
+#include <legacy/lx_emul/impl/slab.h>
 
 
 void *alloc_large_system_hash(const char *tablename,
diff --git a/repos/dde_linux/src/lib/lxip/timer_handler.cc b/repos/dde_linux/src/lib/lxip/timer_handler.cc
index b95dc737eb..8cd83ce30e 100644
--- a/repos/dde_linux/src/lib/lxip/timer_handler.cc
+++ b/repos/dde_linux/src/lib/lxip/timer_handler.cc
@@ -21,7 +21,7 @@
 #include <util/reconstructible.h>
 
 /* Linux kit includes */
-#include <lx_kit/internal/list.h>
+#include <legacy/lx_kit/internal/list.h>
 
 /* local includes */
 #include <lx_emul.h>
diff --git a/repos/dde_linux/src/lib/vfs/lxip/vfs.cc b/repos/dde_linux/src/lib/vfs/lxip/vfs.cc
index e391899976..f46b8ee848 100644
--- a/repos/dde_linux/src/lib/vfs/lxip/vfs.cc
+++ b/repos/dde_linux/src/lib/vfs/lxip/vfs.cc
@@ -30,15 +30,15 @@
 #include <lx.h>
 
 /* Lx_kit */
-#include <lx_kit/env.h>
-#include <lx_kit/malloc.h>
+#include <legacy/lx_kit/env.h>
+#include <legacy/lx_kit/malloc.h>
 
 
 namespace Linux {
 	#include <lx_emul.h>
 	#include <msghdr.h>
 
-	#include <lx_emul/extern_c_begin.h>
+	#include <legacy/lx_emul/extern_c_begin.h>
 	#include <linux/socket.h>
 	#include <uapi/linux/in.h>
 	#include <uapi/linux/if.h>
@@ -49,7 +49,7 @@ namespace Linux {
 	                           int op, char __user *optval,
 	                           int __user *optlen);
 	socket *sock_alloc(void);
-	#include <lx_emul/extern_c_end.h>
+	#include <legacy/lx_emul/extern_c_end.h>
 
 	enum {
 		POLLIN_SET  = (POLLRDNORM | POLLRDBAND | POLLIN | POLLHUP | POLLERR),
diff --git a/repos/dde_linux/src/lib/wifi/firmware.cc b/repos/dde_linux/src/lib/wifi/firmware.cc
index 65118ddd14..574d01fbdb 100644
--- a/repos/dde_linux/src/lib/wifi/firmware.cc
+++ b/repos/dde_linux/src/lib/wifi/firmware.cc
@@ -15,7 +15,7 @@
 #include <base/log.h>
 
 /* local includes */
-#include <lx_kit/env.h>
+#include <legacy/lx_kit/env.h>
 #include <firmware_list.h>
 #include <lx_emul.h>
 
diff --git a/repos/dde_linux/src/lib/wifi/include/lx_emul.h b/repos/dde_linux/src/lib/wifi/include/lx_emul.h
index 1edb3c6fe8..21add70372 100644
--- a/repos/dde_linux/src/lib/wifi/include/lx_emul.h
+++ b/repos/dde_linux/src/lib/wifi/include/lx_emul.h
@@ -20,7 +20,7 @@
 #include <stdarg.h>
 #include <base/fixed_stdint.h>
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 
 #define KBUILD_MODNAME "mod-noname"
 
@@ -32,14 +32,14 @@ enum { HZ = 100 };
 
 #define DEBUG_LINUX_PRINTK 1
 
-#include <lx_emul/printf.h>
+#include <legacy/lx_emul/printf.h>
 
 
 /***************
  ** asm/bug.h **
  ***************/
 
-#include <lx_emul/bug.h>
+#include <legacy/lx_emul/bug.h>
 
 
 /*********************
@@ -53,7 +53,7 @@ void cpu_relax(void);
  ** asm/atomic.h **
  ******************/
 
-#include <lx_emul/atomic.h>
+#include <legacy/lx_emul/atomic.h>
 
 // static inline int atomic_dec_if_positive(atomic_t *v)
 // {
@@ -87,7 +87,7 @@ static inline int atomic_long_cmpxchg(atomic_long_t *v, long old, long n)
  ** linux/types.h **
  *******************/
 
-#include <lx_emul/types.h>
+#include <legacy/lx_emul/types.h>
 
 typedef int clockid_t;
 
@@ -161,7 +161,7 @@ struct callback_head {
  ** asm/barrier.h **
  *******************/
 
-#include <lx_emul/barrier.h>
+#include <legacy/lx_emul/barrier.h>
 
 #define smp_load_acquire(p)     *(p)
 #define smp_store_release(p, v) *(p) = v;
@@ -172,7 +172,7 @@ struct callback_head {
  ** asm-generic/io.h **
  **********************/
 
-#include <lx_emul/mmio.h>
+#include <legacy/lx_emul/mmio.h>
 
 #define mmiowb() barrier()
 struct device;
@@ -195,7 +195,7 @@ void *phys_to_virt(unsigned long address);
  ** linux/compiler.h **
  **********************/
 
-#include <lx_emul/compiler.h>
+#include <legacy/lx_emul/compiler.h>
 
 #define __cond_lock(x,c) (c)
 
@@ -289,7 +289,7 @@ bool refcount_sub_and_test(unsigned int i, refcount_t *r);
  ** linux/module.h **
  ********************/
 
-#include <lx_emul/module.h>
+#include <legacy/lx_emul/module.h>
 
 static inline bool module_sig_ok(struct module *module) { return true; }
 
@@ -310,7 +310,7 @@ static inline void kernel_param_unlock(struct module *mod) { }
  ** linux/errno.h **
  *******************/
 
-#include <lx_emul/errno.h>
+#include <legacy/lx_emul/errno.h>
 
 
 /*****************
@@ -328,7 +328,7 @@ static inline int PTR_ERR_OR_ZERO(const void *ptr)
  ** linux/poison.h **
  ********************/
 
-#include <lx_emul/list.h>
+#include <legacy/lx_emul/list.h>
 
 
 /****************
@@ -427,7 +427,7 @@ struct page_frag_cache
  ** linux/gfp.h **
  *****************/
 
-#include <lx_emul/gfp.h>
+#include <legacy/lx_emul/gfp.h>
 
 struct page *alloc_pages_node(int nid, gfp_t gfp_mask, unsigned int order);
 
@@ -459,7 +459,7 @@ void *page_frag_alloc(struct page_frag_cache *nc, unsigned int fragsz, gfp_t gfp
  ** linux/string.h **
  ********************/
 
-#include <lx_emul/string.h>
+#include <legacy/lx_emul/string.h>
 
 void memzero_explicit(void *s, size_t count);
 
@@ -470,7 +470,7 @@ bool sysfs_streq(const char *s1, const char *s2);
  ** linux/spinlock.h **
  **********************/
 
-#include <lx_emul/spinlock.h>
+#include <legacy/lx_emul/spinlock.h>
 
 int spin_is_locked(spinlock_t *lock);
 void free_bucket_spinlocks(spinlock_t *locks);
@@ -482,7 +482,7 @@ int alloc_bucket_spinlocks(spinlock_t **locks, unsigned int *locks_mask,
  ** linux/mutex.h **
  *******************/
 
-#include <lx_emul/mutex.h>
+#include <legacy/lx_emul/mutex.h>
 
 LX_MUTEX_INIT_DECLARE(crypto_default_rng_lock);
 LX_MUTEX_INIT_DECLARE(fanout_mutex);
@@ -507,14 +507,14 @@ LX_MUTEX_INIT_DECLARE(rtnl_mutex);
  ** linux/rwsem.h **
  *******************/
 
-#include <lx_emul/semaphore.h>
+#include <legacy/lx_emul/semaphore.h>
 
 
 /********************
  ** linux/kernel.h **
  ********************/
 
-#include <lx_emul/kernel.h>
+#include <legacy/lx_emul/kernel.h>
 
 #define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))
 
@@ -564,7 +564,7 @@ int sscanf(const char *, const char *, ...);
  ** linux/jiffies.h **
  *********************/
 
-#include <lx_emul/jiffies.h>
+#include <legacy/lx_emul/jiffies.h>
 
 static inline unsigned int jiffies_to_usecs(const unsigned long j) { return j * JIFFIES_TICK_US; }
 
@@ -575,7 +575,7 @@ static inline unsigned int jiffies_to_usecs(const unsigned long j) { return j *
  ** linux/time.h **
  ******************/
 
-#include <lx_emul/time.h>
+#include <legacy/lx_emul/time.h>
 
 enum {
 	MSEC_PER_SEC  = 1000L,
@@ -611,7 +611,7 @@ static inline void ktime_get_ts(struct timespec *ts)
  ** linux/timer.h **
  *******************/
 
-#include <lx_emul/timer.h>
+#include <legacy/lx_emul/timer.h>
 
 #define from_timer(var, callback_timer, timer_fieldname) \
 	container_of(callback_timer, typeof(*var), timer_fieldname)
@@ -632,7 +632,7 @@ enum {
  ** linux/byteorder/generic.h **
  *******************************/
 
-#include <lx_emul/byteorder.h>
+#include <legacy/lx_emul/byteorder.h>
 
 #define cpu_to_be64  __cpu_to_be64
 #define be64_to_cpup __be64_to_cpup
@@ -751,7 +751,7 @@ unsigned int hweight64(__u64 w);
  ** linux/bitops.h, asm/bitops.h **
  **********************************/
 
-#include <lx_emul/bitops.h>
+#include <legacy/lx_emul/bitops.h>
 
 static inline unsigned long hweight_long(unsigned long w) {
 	return sizeof(w) == 4 ? hweight32(w) : hweight64(w); }
@@ -831,7 +831,7 @@ unsigned int memalloc_noreclaim_save(void);
  ** linux/kobject.h **
  *********************/
 
-#include <lx_emul/kobject.h>
+#include <legacy/lx_emul/kobject.h>
 
 enum kobject_action
 {
@@ -987,7 +987,7 @@ unsigned long int_sqrt(unsigned long);
  ** linux/workqueue.h **
  ***********************/
 
-#include <lx_emul/work.h>
+#include <legacy/lx_emul/work.h>
 
 extern struct workqueue_struct *system_power_efficient_wq;
 
@@ -1069,7 +1069,7 @@ void sysfs_remove_link(struct kobject *kobj, const char *name);
  ** linux/pm.h **
  ****************/
 
-#include <lx_emul/pm.h>
+#include <legacy/lx_emul/pm.h>
 
 #define PM_EVENT_HIBERNATE 0x0004
 #define PM_EVENT_SLEEP     (PM_EVENT_SUSPEND | PM_EVENT_HIBERNATE)
@@ -3459,14 +3459,14 @@ int request_firmware_nowait( struct module *module, bool uevent, const char *nam
  ** linux/ioport.h **
  ********************/
 
-#include <lx_emul/ioport.h>
+#include <legacy/lx_emul/ioport.h>
 
 
 /***********************
  ** linux/irqreturn.h **
  ***********************/
 
-#include <lx_emul/irq.h>
+#include <legacy/lx_emul/irq.h>
 
 /***********************
  ** linux/interrupt.h **
@@ -3531,7 +3531,7 @@ struct pci_dev {
 	u16 pcie_flags_reg;
 };
 
-#include <lx_emul/pci.h>
+#include <legacy/lx_emul/pci.h>
 
 void pci_set_drvdata(struct pci_dev *pdev, void *data);
 
@@ -5635,7 +5635,7 @@ unsigned long rlimit(unsigned int limit);
 
 int device_property_read_string(struct device *dev, const char *propname, const char **val);
 
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 
 /******************************
diff --git a/repos/dde_linux/src/lib/wifi/init.cc b/repos/dde_linux/src/lib/wifi/init.cc
index 9d7d9ab870..1f2db4a3fe 100644
--- a/repos/dde_linux/src/lib/wifi/init.cc
+++ b/repos/dde_linux/src/lib/wifi/init.cc
@@ -21,12 +21,12 @@
 
 #include <lx_emul.h>
 
-#include <lx_kit/malloc.h>
-#include <lx_kit/env.h>
-#include <lx_kit/irq.h>
-#include <lx_kit/work.h>
-#include <lx_kit/timer.h>
-#include <lx_kit/pci.h>
+#include <legacy/lx_kit/malloc.h>
+#include <legacy/lx_kit/env.h>
+#include <legacy/lx_kit/irq.h>
+#include <legacy/lx_kit/work.h>
+#include <legacy/lx_kit/timer.h>
+#include <legacy/lx_kit/pci.h>
 
 
 /*********************
diff --git a/repos/dde_linux/src/lib/wifi/lx.h b/repos/dde_linux/src/lib/wifi/lx.h
index 1e7ff3e0f4..ab2cc72eab 100644
--- a/repos/dde_linux/src/lib/wifi/lx.h
+++ b/repos/dde_linux/src/lib/wifi/lx.h
@@ -21,7 +21,7 @@
 #include <drivers/nic/mode.h>
 
 /* local includes */
-#include <lx_kit/scheduler.h>
+#include <legacy/lx_kit/scheduler.h>
 
 
 #define DEBUG_PRINTK     1
diff --git a/repos/dde_linux/src/lib/wifi/lxcc_emul.cc b/repos/dde_linux/src/lib/wifi/lxcc_emul.cc
index 1d9a11c6ab..68aa1544cb 100644
--- a/repos/dde_linux/src/lib/wifi/lxcc_emul.cc
+++ b/repos/dde_linux/src/lib/wifi/lxcc_emul.cc
@@ -29,9 +29,9 @@
 #include <lx.h>
 #include <lx_emul.h>
 
-#include <lx_kit/env.h>
-#include <lx_kit/malloc.h>
-#include <lx_kit/scheduler.h>
+#include <legacy/lx_kit/env.h>
+#include <legacy/lx_kit/malloc.h>
+#include <legacy/lx_kit/scheduler.h>
 
 
 typedef ::size_t       size_t;
@@ -393,7 +393,7 @@ extern "C" int memcpy_fromiovecend(unsigned char *kdata, const struct iovec *iov
  ** Memory allocation *
  **********************/
 
-#include <lx_emul/impl/slab.h>
+#include <legacy/lx_emul/impl/slab.h>
 
 void *kvmalloc(size_t size, gfp_t flags)
 {
@@ -614,7 +614,7 @@ int strict_strtoul(const char *s, unsigned int base, unsigned long *res)
  ** linux/delay.h **
  *******************/
 
-#include <lx_emul/impl/delay.h>
+#include <legacy/lx_emul/impl/delay.h>
 
 
 void usleep_range(unsigned long min, unsigned long max)
@@ -1254,7 +1254,7 @@ int request_module(char const* format, ...)
  ** kernel/locking/mutex.c **
  ****************************/
 
-#include <lx_emul/impl/mutex.h>
+#include <legacy/lx_emul/impl/mutex.h>
 
 
 /******************
@@ -1283,7 +1283,7 @@ void *kthread_run(int (*threadfn)(void *), void *data, char const *name)
  ** linux/pci.h **
  *****************/
 
-#include <lx_emul/impl/pci.h>
+#include <legacy/lx_emul/impl/pci.h>
 
 
 void *pci_get_drvdata(struct pci_dev *pdev)
@@ -1326,7 +1326,7 @@ void * const *pcim_iomap_table(struct pci_dev *pdev)
  ** linux/interrupt.h **
  ***********************/
 
-#include <lx_kit/irq.h>
+#include <legacy/lx_kit/irq.h>
 
 
 int request_irq(unsigned int irq, irq_handler_t handler,
@@ -1359,7 +1359,7 @@ void pci_dev_put(struct pci_dev *pci_dev)
  ** linux/workqueue.h **
  ***********************/
 
-#include <lx_emul/impl/work.h>
+#include <legacy/lx_emul/impl/work.h>
 
 
 bool mod_delayed_work(struct workqueue_struct *wq, struct delayed_work *dwork,
@@ -1473,7 +1473,7 @@ void tasklet_schedule(struct tasklet_struct *tasklet)
  ** linux/completion.h **
  ************************/
 
-#include <lx_emul/impl/completion.h>
+#include <legacy/lx_emul/impl/completion.h>
 
 
 long __wait_completion(struct completion *work, unsigned long timeout) {
@@ -1499,14 +1499,14 @@ long wait_for_completion_killable_timeout(struct completion *work,
  ** linux/wait.h **
  ******************/
 
-#include <lx_emul/impl/wait.h>
+#include <legacy/lx_emul/impl/wait.h>
 
 
 /*******************
  ** linux/timer.h **
  *******************/
 
-#include <lx_emul/impl/timer.h>
+#include <legacy/lx_emul/impl/timer.h>
 
 
 void init_timer_deferrable(struct timer_list *timer) { /* XXX */ }
@@ -1522,7 +1522,7 @@ int wake_up_process(struct task_struct *tsk) { return 0; }
  ** linux/sched.h **
  *******************/
 
-#include <lx_emul/impl/sched.h>
+#include <legacy/lx_emul/impl/sched.h>
 
 
 /*****************
diff --git a/repos/dde_linux/src/lib/wifi/nic.cc b/repos/dde_linux/src/lib/wifi/nic.cc
index 7d7aa1c6c1..21ad5d7092 100644
--- a/repos/dde_linux/src/lib/wifi/nic.cc
+++ b/repos/dde_linux/src/lib/wifi/nic.cc
@@ -29,13 +29,13 @@
 #include <lx.h>
 #include <lx_emul.h>
 
-#include <lx_kit/env.h>
+#include <legacy/lx_kit/env.h>
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 # include <linux/skbuff.h>
 # include <net/cfg80211.h>
 # include <lxc.h>
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 
 enum {
diff --git a/repos/dde_linux/src/lib/wifi/socket_call.cc b/repos/dde_linux/src/lib/wifi/socket_call.cc
index a2486cdc2c..e2589ac91e 100644
--- a/repos/dde_linux/src/lib/wifi/socket_call.cc
+++ b/repos/dde_linux/src/lib/wifi/socket_call.cc
@@ -19,11 +19,11 @@
 #include <lx.h>
 #include <lx_emul.h>
 
-#include <lx_emul/extern_c_begin.h>
+#include <legacy/lx_emul/extern_c_begin.h>
 # include <linux/socket.h>
 # include <linux/net.h>
 # include <net/sock.h>
-#include <lx_emul/extern_c_end.h>
+#include <legacy/lx_emul/extern_c_end.h>
 
 #include <wifi/socket_call.h>