#include "lisp.h"
#include "buffer.h"
#include "syntax.h"
-#include "lib/str.h"
+#include <lib-lib/str.h>
#else /* not emacs */
/* Free everything we malloc. */
#ifdef MATCH_MAY_ALLOCATE
-#define mem_free_VAR(var) if (var) REGEX_mem_free (var); var = NULL
+#define mem_free_VAR(var) if (var) REGEX_p_delete(var); var = NULL
#define mem_free_VARIABLES() \
do { \
REGEX_mem_free_STACK (fail_stack.stack); \