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
2026-01-21 20:42:56 +01:00 · 2021-07-16 10:49:07 +02:00
parent f939b9ffb5
commit b16bb82f8b
161 changed files with 575 additions and 559 deletions
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 =
--- 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 :
--- 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")
--- 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")
--- 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")
--- 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")
--- 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")
--- 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)
--- 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)
--- 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)

--- 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) \
--- 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_ */
--- 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_ */
--- 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 };

--- 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 */
--- 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>


 /****************************
--- 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
--- 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_ */
--- 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_ */
--- 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()
 {
--- 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 */
--- 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
--- 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" {

--- 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_ */
--- 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();
--- 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>


 /****************************
--- 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 =
--- 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>


--- 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" {
--- 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;
--- 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
--- 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)
--- 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_ */
--- 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);

--- 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
--- 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;
--- 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_ */
--- 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;
--- 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
 {
--- 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;

--- 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;

--- 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>


 /**
--- 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
--- 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;
--- 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>


--- 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" {
--- 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
--- 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_ */
--- 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;

--- 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
--- 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;

--- 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;
--- 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>
--- 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
--- 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_ */
--- 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;

--- 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
--- a/repos/dde_linux/src/include/legacy/lx_emul/atomic.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/atomic.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/bitops.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/bitops.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/bug.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/bug.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/byteorder.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/byteorder.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/compiler.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/compiler.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/completion.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/completion.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/errno.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/errno.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/extern_c_begin.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/extern_c_begin.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/extern_c_end.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/extern_c_end.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/gfp.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/gfp.h
--- a/repos/dde_linux/src/include/legacy/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;
--- a/repos/dde_linux/src/include/legacy/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
--- a/repos/dde_linux/src/include/legacy/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)
--- a/repos/dde_linux/src/include/legacy/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)
--- a/repos/dde_linux/src/include/legacy/lx_emul/impl/kernel.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/impl/kernel.h
--- a/repos/dde_linux/src/include/legacy/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 };

--- a/repos/dde_linux/src/include/legacy/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)
--- a/repos/dde_linux/src/include/legacy/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)
--- a/repos/dde_linux/src/include/legacy/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;
--- a/repos/dde_linux/src/include/legacy/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)
--- a/repos/dde_linux/src/include/legacy/lx_emul/impl/spinlock.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/impl/spinlock.h
--- a/repos/dde_linux/src/include/legacy/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)
--- a/repos/dde_linux/src/include/legacy/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,
--- a/repos/dde_linux/src/include/legacy/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)
--- a/repos/dde_linux/src/include/legacy/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)
--- a/repos/dde_linux/src/include/legacy/lx_emul/ioport.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/ioport.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/irq.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/irq.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/jiffies.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/jiffies.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/kernel.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/kernel.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/kobject.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/kobject.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/list.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/list.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/mmio.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/mmio.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/module.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/module.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/mutex.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/mutex.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/pci.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/pci.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/pm.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/pm.h
--- a/repos/dde_linux/src/include/legacy/lx_emul/printf.h
+++ b/repos/dde_linux/src/include/legacy/lx_emul/printf.h
--- a/Show More
+++ b/Show More