Index: uspace/srv/console/console.c
===================================================================
--- uspace/srv/console/console.c	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/console/console.c	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -45,5 +45,5 @@
 #include <unistd.h>
 #include <async.h>
-#include <libadt/fifo.h>
+#include <adt/fifo.h>
 #include <sys/mman.h>
 #include <stdio.h>
Index: uspace/srv/fs/devfs/devfs_ops.c
===================================================================
--- uspace/srv/fs/devfs/devfs_ops.c	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/fs/devfs/devfs_ops.c	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -42,5 +42,5 @@
 #include <string.h>
 #include <libfs.h>
-#include <libadt/hash_table.h>
+#include <adt/hash_table.h>
 #include "devfs.h"
 #include "devfs_ops.h"
Index: uspace/srv/fs/fat/fat_idx.c
===================================================================
--- uspace/srv/fs/fat/fat_idx.c	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/fs/fat/fat_idx.c	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -40,6 +40,6 @@
 #include <errno.h>
 #include <string.h>
-#include <libadt/hash_table.h>
-#include <libadt/list.h>
+#include <adt/hash_table.h>
+#include <adt/list.h>
 #include <assert.h>
 #include <futex.h>
Index: uspace/srv/fs/fat/fat_ops.c
===================================================================
--- uspace/srv/fs/fat/fat_ops.c	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/fs/fat/fat_ops.c	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -49,6 +49,6 @@
 #include <string.h>
 #include <byteorder.h>
-#include <libadt/hash_table.h>
-#include <libadt/list.h>
+#include <adt/hash_table.h>
+#include <adt/list.h>
 #include <assert.h>
 #include <futex.h>
Index: uspace/srv/fs/tmpfs/tmpfs.h
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs.h	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/fs/tmpfs/tmpfs.h	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -39,5 +39,5 @@
 #include <sys/types.h>
 #include <bool.h>
-#include <libadt/hash_table.h>
+#include <adt/hash_table.h>
 
 #ifndef dprintf
Index: uspace/srv/fs/tmpfs/tmpfs_ops.c
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -48,5 +48,5 @@
 #include <assert.h>
 #include <sys/types.h>
-#include <libadt/hash_table.h>
+#include <adt/hash_table.h>
 #include <as.h>
 #include <libfs.h>
Index: uspace/srv/kbd/Makefile
===================================================================
--- uspace/srv/kbd/Makefile	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/kbd/Makefile	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -35,5 +35,5 @@
 include $(LIBC_PREFIX)/Makefile.toolchain
 
-CFLAGS += -Iinclude -I../libadt/include
+CFLAGS += -Iinclude
 
 LIBS = $(LIBC_PREFIX)/libc.a
Index: uspace/srv/kbd/genarch/gsp.c
===================================================================
--- uspace/srv/kbd/genarch/gsp.c	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/kbd/genarch/gsp.c	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -50,5 +50,5 @@
 
 #include <gsp.h>
-#include <libadt/hash_table.h>
+#include <adt/hash_table.h>
 #include <stdlib.h>
 #include <stdio.h>
Index: uspace/srv/kbd/generic/kbd.c
===================================================================
--- uspace/srv/kbd/generic/kbd.c	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/kbd/generic/kbd.c	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -46,5 +46,5 @@
 #include <async.h>
 #include <errno.h>
-#include <libadt/fifo.h>
+#include <adt/fifo.h>
 #include <io/console.h>
 #include <io/keycode.h>
Index: uspace/srv/kbd/include/gsp.h
===================================================================
--- uspace/srv/kbd/include/gsp.h	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/kbd/include/gsp.h	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -38,5 +38,5 @@
 #define KBD_GSP_H_
 
-#include <libadt/hash_table.h>
+#include <adt/hash_table.h>
 
 enum {
Index: uspace/srv/ns/clonable.c
===================================================================
--- uspace/srv/ns/clonable.c	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/ns/clonable.c	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -33,5 +33,5 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
-#include <libadt/list.h>
+#include <adt/list.h>
 #include <bool.h>
 #include <errno.h>
Index: uspace/srv/ns/service.c
===================================================================
--- uspace/srv/ns/service.c	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/ns/service.c	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -32,5 +32,5 @@
 
 #include <ipc/ipc.h>
-#include <libadt/hash_table.h>
+#include <adt/hash_table.h>
 #include <assert.h>
 #include <errno.h>
Index: uspace/srv/ns/task.c
===================================================================
--- uspace/srv/ns/task.c	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/ns/task.c	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -32,5 +32,5 @@
 
 #include <ipc/ipc.h>
-#include <libadt/hash_table.h>
+#include <adt/hash_table.h>
 #include <bool.h>
 #include <errno.h>
Index: uspace/srv/vfs/vfs.c
===================================================================
--- uspace/srv/vfs/vfs.c	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/vfs/vfs.c	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -44,5 +44,5 @@
 #include <string.h>
 #include <as.h>
-#include <libadt/list.h>
+#include <adt/list.h>
 #include <atomic.h>
 #include "vfs.h"
Index: uspace/srv/vfs/vfs.h
===================================================================
--- uspace/srv/vfs/vfs.h	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/vfs/vfs.h	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -35,5 +35,5 @@
 
 #include <ipc/ipc.h>
-#include <libadt/list.h>
+#include <adt/list.h>
 #include <futex.h>
 #include <rwlock.h>
Index: uspace/srv/vfs/vfs_lookup.c
===================================================================
--- uspace/srv/vfs/vfs_lookup.c	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/vfs/vfs_lookup.c	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -44,5 +44,5 @@
 #include <bool.h>
 #include <futex.h>
-#include <libadt/list.h>
+#include <adt/list.h>
 #include <vfs/canonify.h>
 
Index: uspace/srv/vfs/vfs_node.c
===================================================================
--- uspace/srv/vfs/vfs_node.c	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/vfs/vfs_node.c	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -41,5 +41,5 @@
 #include <futex.h>
 #include <rwlock.h>
-#include <libadt/hash_table.h>
+#include <adt/hash_table.h>
 #include <assert.h>
 #include <async.h>
Index: uspace/srv/vfs/vfs_ops.c
===================================================================
--- uspace/srv/vfs/vfs_ops.c	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/vfs/vfs_ops.c	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -46,5 +46,5 @@
 #include <futex.h>
 #include <rwlock.h>
-#include <libadt/list.h>
+#include <adt/list.h>
 #include <unistd.h>
 #include <ctype.h>
Index: uspace/srv/vfs/vfs_register.c
===================================================================
--- uspace/srv/vfs/vfs_register.c	(revision f8ef6608009092d820081ab0f9bd7c8da8205b96)
+++ uspace/srv/vfs/vfs_register.c	(revision 080ad7fcf59dd514b2dceeb65a63f76c705addac)
@@ -47,5 +47,5 @@
 #include <bool.h>
 #include <futex.h>
-#include <libadt/list.h>
+#include <adt/list.h>
 #include <as.h>
 #include <assert.h>