diff --git a/nostrdb/ccan/ccan/array_size/array_size.h b/nostrdb/ccan/ccan/array_size/array_size.h
index 3f9494e8..b3591633 100644
--- a/nostrdb/ccan/ccan/array_size/array_size.h
+++ b/nostrdb/ccan/ccan/array_size/array_size.h
@@ -2,7 +2,7 @@
 #ifndef CCAN_ARRAY_SIZE_H
 #define CCAN_ARRAY_SIZE_H
 #include "../config.h"
-#include "build_assert.h"
+#include "ccan/build_assert/build_assert.h"
 
 /**
  * ARRAY_SIZE - get the number of elements in a visible array
diff --git a/nostrdb/ccan/ccan/container_of/container_of.h b/nostrdb/ccan/ccan/container_of/container_of.h
index b27d7f3d..de6d7144 100644
--- a/nostrdb/ccan/ccan/container_of/container_of.h
+++ b/nostrdb/ccan/ccan/container_of/container_of.h
@@ -4,7 +4,7 @@
 #include <stddef.h>
 
 #include "../config.h"
-#include "check_type.h"
+#include "ccan/check_type/check_type.h"
 
 /**
  * container_of - get pointer to enclosing structure
diff --git a/nostrdb/ccan/ccan/crypto/sha256/sha256.c b/nostrdb/ccan/ccan/crypto/sha256/sha256.c
index b869dea7..26e142cb 100644
--- a/nostrdb/ccan/ccan/crypto/sha256/sha256.c
+++ b/nostrdb/ccan/ccan/crypto/sha256/sha256.c
@@ -7,8 +7,8 @@
  * file COPYING or http://www.opensource.org/licenses/mit-license.php.
  */
 #include "sha256.h"
-#include "endian.h"
-#include "compiler.h"
+#include "ccan/endian/endian.h"
+#include "ccan/compiler/compiler.h"
 #include <stdbool.h>
 #include <assert.h>
 #include <string.h>
diff --git a/nostrdb/ccan/ccan/list/list.h b/nostrdb/ccan/ccan/list/list.h
index 4574e911..4b7007ba 100644
--- a/nostrdb/ccan/ccan/list/list.h
+++ b/nostrdb/ccan/ccan/list/list.h
@@ -5,8 +5,8 @@
 #include <stdbool.h>
 #include <assert.h>
 #include "str.h"
-#include "container_of.h"
-#include "check_type.h"
+#include "ccan/container_of/container_of.h"
+#include "ccan/check_type/check_type.h"
 
 /**
  * struct list_node - an entry in a doubly-linked list
diff --git a/nostrdb/ccan/ccan/mem/mem.h b/nostrdb/ccan/ccan/mem/mem.h
index 9b8d01a3..d02ed8ae 100644
--- a/nostrdb/ccan/ccan/mem/mem.h
+++ b/nostrdb/ccan/ccan/mem/mem.h
@@ -3,7 +3,7 @@
 #define CCAN_MEM_H
 
 #include "../config.h"
-#include "../compiler.h"
+#include "ccan/compiler/compiler.h"
 
 #include <string.h>
 #include <stdbool.h>
diff --git a/nostrdb/ccan/ccan/structeq/structeq.h b/nostrdb/ccan/ccan/structeq/structeq.h
index bb701465..18619756 100644
--- a/nostrdb/ccan/ccan/structeq/structeq.h
+++ b/nostrdb/ccan/ccan/structeq/structeq.h
@@ -1,8 +1,8 @@
 /* MIT (BSD) license - see LICENSE file for details */
 #ifndef CCAN_STRUCTEQ_H
 #define CCAN_STRUCTEQ_H
-#include "build_assert.h"
-#include "cppmagic.h"
+#include "ccan/build_assert/build_assert.h"
+#include "ccan/cppmagic/cppmagic.h"
 #include <string.h>
 #include <stdbool.h>
 
diff --git a/nostrdb/ccan/ccan/take/take.c b/nostrdb/ccan/ccan/take/take.c
index 3b59db08..04bcc7ed 100644
--- a/nostrdb/ccan/ccan/take/take.c
+++ b/nostrdb/ccan/ccan/take/take.c
@@ -1,6 +1,6 @@
 /* CC0 (Public domain) - see LICENSE file for details */
 #include "take.h"
-#include "likely.h"
+#include "ccan/likely/likely.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/nostrdb/ccan/ccan/tal/str/str.c b/nostrdb/ccan/ccan/tal/str/str.c
index 1fb66858..3ec0be72 100644
--- a/nostrdb/ccan/ccan/tal/str/str.c
+++ b/nostrdb/ccan/ccan/tal/str/str.c
@@ -4,7 +4,6 @@
 #include <string.h>
 #include <limits.h>
 #include <stdlib.h>
-#include "talstr.h"
 #include <sys/types.h>
 #include <regex.h>
 #include <stdarg.h>
diff --git a/nostrdb/ccan/ccan/tal/str/str.h b/nostrdb/ccan/ccan/tal/str/str.h
index fbf53a86..56a0f22b 100644
--- a/nostrdb/ccan/ccan/tal/str/str.h
+++ b/nostrdb/ccan/ccan/tal/str/str.h
@@ -4,7 +4,7 @@
 #ifdef TAL_USE_TALLOC
 #include <ccan/tal/talloc/talloc.h>
 #else
-#include "tal.h"
+#include "ccan/tal/tal.h"
 #endif
 #include <string.h>
 #include <stdbool.h>
diff --git a/nostrdb/ccan/ccan/tal/tal.c b/nostrdb/ccan/ccan/tal/tal.c
index 516b4404..c9c8e9f7 100644
--- a/nostrdb/ccan/ccan/tal/tal.c
+++ b/nostrdb/ccan/ccan/tal/tal.c
@@ -1,8 +1,8 @@
 /* Licensed under BSD-MIT - see LICENSE file for details */
 #include "tal.h"
-#include "../compiler.h"
-#include "list.h"
-#include "alignof.h"
+#include "ccan/compiler/compiler.h"
+#include "ccan/list/list.h"
+#include "ccan/alignof/alignof.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/nostrdb/ccan/ccan/tal/tal.h b/nostrdb/ccan/ccan/tal/tal.h
index 8daafa3d..6e7f12e5 100644
--- a/nostrdb/ccan/ccan/tal/tal.h
+++ b/nostrdb/ccan/ccan/tal/tal.h
@@ -2,11 +2,11 @@
 #ifndef CCAN_TAL_H
 #define CCAN_TAL_H
 #include "../config.h"
-#include "../compiler.h"
-#include "likely.h"
-#include "typesafe_cb.h"
-#include "str.h"
-#include "take.h"
+#include "ccan/compiler/compiler.h"
+#include "ccan/likely/likely.h"
+#include "ccan/typesafe_cb/typesafe_cb.h"
+#include "ccan/str/str.h"
+#include "ccan/take/take.h"
 
 #include <stdlib.h>
 #include <stdbool.h>