10 files changed, 12 insertions, 12 deletions
diff --git a/src/user/app/drawmouse/drawmouse.c b/src/user/app/drawmouse/drawmouse.c
index 24aa55e..31a1255 100644
--- a/src/user/app/drawmouse/drawmouse.c
+++ b/src/user/app/drawmouse/drawmouse.c
@@ -1,11 +1,11 @@
 #include <camellia.h>
 #include <camellia/syscalls.h>
-#include <shared/container/ring.h>
+#include <shared/ring.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <user/lib/draw/draw.h>
+#include <draw.h>
 
 #define MOUSE_SIZE 10
 
diff --git a/src/user/app/dvd/dvd.c b/src/user/app/dvd/dvd.c
index 70adc8b..a15b440 100644
--- a/src/user/app/dvd/dvd.c
+++ b/src/user/app/dvd/dvd.c
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <user/lib/draw/draw.h>
+#include <draw.h>
 
 #define eprintf(fmt, ...) fprintf(stderr, "vterm: "fmt"\n" __VA_OPT__(,) __VA_ARGS__)
 
diff --git a/src/user/app/init/driver/ps2.c b/src/user/app/init/driver/ps2.c
index a5cdb07..4fee60a 100644
--- a/src/user/app/init/driver/ps2.c
+++ b/src/user/app/init/driver/ps2.c
@@ -1,6 +1,6 @@
 #include "driver.h"
 #include <camellia/syscalls.h>
-#include <shared/container/ring.h>
+#include <shared/ring.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <camellia/compat.h>
diff --git a/src/user/app/netdog/nd.c b/src/user/app/netdog/nd.c
index fdc8361..af5c264 100644
--- a/src/user/app/netdog/nd.c
+++ b/src/user/app/netdog/nd.c
@@ -2,7 +2,7 @@
 #include <camellia/syscalls.h>
 #include <stdio.h>
 #include <string.h>
-#include <user/lib/thread.h>
+#include <thread.h>
 
 #define eprintf(fmt, ...) fprintf(stderr, "netdog: "fmt"\n" __VA_OPT__(,) __VA_ARGS__)
 
diff --git a/src/user/app/netstack/netstack.c b/src/user/app/netstack/netstack.c
index c2e9223..296fee2 100644
--- a/src/user/app/netstack/netstack.c
+++ b/src/user/app/netstack/netstack.c
@@ -6,7 +6,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <user/lib/thread.h>
+#include <thread.h>
 
 struct net_state state = {
 	// TODO dynamically get mac
diff --git a/src/user/app/netstack/tcp.c b/src/user/app/netstack/tcp.c
index 490ad5b..d1adeab 100644
--- a/src/user/app/netstack/tcp.c
+++ b/src/user/app/netstack/tcp.c
@@ -5,7 +5,7 @@
 #include "proto.h"
 #include "util.h"
 #include <assert.h>
-#include <shared/container/ring.h>
+#include <shared/ring.h>
 
 enum {
 	SrcPort = 0,
diff --git a/src/user/app/tests/kernel/threads.c b/src/user/app/tests/kernel/threads.c
index abca41c..b3c1c06 100644
--- a/src/user/app/tests/kernel/threads.c
+++ b/src/user/app/tests/kernel/threads.c
@@ -2,8 +2,8 @@
 #include <camellia/flags.h>
 #include <camellia/syscalls.h>
 #include <string.h>
-#include <user/lib/esemaphore.h>
-#include <user/lib/thread.h>
+#include <esemaphore.h>
+#include <thread.h>
 
 int global_n;
 static void basic_thread(void *sem) {
diff --git a/src/user/app/tests/libc/esemaphore.c b/src/user/app/tests/libc/esemaphore.c
index 2f1d4bc..f089f4f 100644
--- a/src/user/app/tests/libc/esemaphore.c
+++ b/src/user/app/tests/libc/esemaphore.c
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <user/lib/esemaphore.h>
+#include <esemaphore.h>
 
 static void odd(hid_t out, struct evil_sem *sem1, struct evil_sem *sem2) {
 	_sys_write(out, "1", 1, -1, 0);
diff --git a/src/user/app/tests/shared/ringbuf.c b/src/user/app/tests/shared/ringbuf.c
index d4e8dc9..d2a35a1 100644
--- a/src/user/app/tests/shared/ringbuf.c
+++ b/src/user/app/tests/shared/ringbuf.c
@@ -1,5 +1,5 @@
 #include "../tests.h"
-#include <shared/container/ring.h>
+#include <shared/ring.h>
 #include <string.h>
 
 static void test_ringbuf(void) {
diff --git a/src/user/app/vterm/vterm.h b/src/user/app/vterm/vterm.h
index b006ede..72c1fd0 100644
--- a/src/user/app/vterm/vterm.h
+++ b/src/user/app/vterm/vterm.h
@@ -2,7 +2,7 @@
 #include <camellia/types.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <user/lib/draw/draw.h>
+#include <draw.h>
 
 #define eprintf(fmt, ...) fprintf(stderr, "vterm: "fmt"\n" __VA_OPT__(,) __VA_ARGS__)