-#include "ccan/str_talloc/str_talloc.h"
-#include "ccan/grab_file/grab_file.h"
-#include "ccan/talloc/talloc.h"
+#include "ccan/take/take.h"
+#include "ccan/rbuf/rbuf.h"
+#include "ccan/tal/path/path.h"
+#include "ccan/tal/grab_file/grab_file.h"
+#include "ccan/err/err.h"
+#include "ccan/noerr/noerr.h"