-#include "talloc/talloc.h"
-#include "string/string.h"
+#include <ccan/talloc/talloc.h>
+#include <ccan/str/str.h>
+#include <ccan/grab_file/grab_file.h>
+#include <ccan/str_talloc/str_talloc.h>
#include "tools.h"
#include <err.h>
#include <stdbool.h>
char *str;
unsigned int len;
+ /* Ignore lines starting with # (e.g. #include) */
+ if (lines[i][0] == '#')
+ continue;
+
/* Start of line, or after ". */
if (strstarts(lines[i], "ccan/"))
str = lines[i];