diff --git a/lib/src/clixon_xpath_ctx.c b/lib/src/clixon_xpath_ctx.c
index 39221a37..721df45c 100644
--- a/lib/src/clixon_xpath_ctx.c
+++ b/lib/src/clixon_xpath_ctx.c
@@ -162,7 +162,7 @@ ctx_print(cbuf *cb,
int
ctx2boolean(xp_ctx *xc)
{
- int b;
+ int b = -1;
switch (xc->xc_type){
case XT_NODESET:
b = (xc->xc_size != 0);
diff --git a/util/Makefile.in b/util/Makefile.in
index 24379f48..d8961628 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -61,7 +61,7 @@ LIBS = @LIBS@
CPPFLAGS = @CPPFLAGS@
-INCLUDES = -I. @INCLUDES@ -I$(top_srcdir)/lib/clixon -I$(top_srcdir)/include -I$(top_srcdir)
+INCLUDES = -I. @INCLUDES@ -I$(top_srcdir)/lib -I$(top_srcdir)/include
MYLIB = ../lib/src/libclixon$(SH_SUFFIX).$(CLIXON_MAJOR).$(CLIXON_MINOR)
diff --git a/util/clixon_util_xpath.c b/util/clixon_util_xpath.c
index 7bc849de..2ee8d2e8 100644
--- a/util/clixon_util_xpath.c
+++ b/util/clixon_util_xpath.c
@@ -62,7 +62,7 @@ echo "a\n" | xpath
#include
/* clixon */
-#include
+#include "clixon/clixon.h"
static int
usage(char *argv0)
@@ -128,7 +128,7 @@ main(int argc, char **argv)
char *xpath0 = NULL;
char *filename;
xp_ctx *xc = NULL;
- cbuf *cb;
+ cbuf *cb = NULL;
clicon_log_init("xpath", LOG_DEBUG, CLICON_LOG_STDERR);
optind = 1;