diff --git a/sys/arch/xen/include/xenbus.h b/sys/arch/xen/include/xenbus.h
index f9b8c24c9dd8..6f88d8b30e61 100644
--- a/sys/arch/xen/include/xenbus.h
+++ b/sys/arch/xen/include/xenbus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus.h,v 1.17 2020/04/07 13:36:22 jdolecek Exp $ */
+/* $NetBSD: xenbus.h,v 1.18 2020/04/07 13:38:50 jdolecek Exp $ */
 /******************************************************************************
  * xenbus.h
  *
@@ -166,20 +166,6 @@ int xenbus_free_device(struct xenbus_device *);
 #define XENBUS_EXIST_ERR(err) ((err) == -ENOENT || (err) == -ERANGE)
 
 
-/**
- * Register a watch on the given path, using the given xenbus_watch structure
- * for storage, and the given callback function as the callback.  Return 0 on
- * success, or -errno on error.  On success, the given path will be saved as
- * watch->node, and remains the caller's to free.  On error, watch->node will
- * be NULL, the device will switch to XenbusStateClosing, and the error will
- * be saved in the store.
- */
-int xenbus_watch_path(struct xenbus_device *dev, char *path,
-		      struct xenbus_watch *watch, 
-		      void (*callback)(struct xenbus_watch *,
-				       const char **, unsigned int));
-
-
 /**
  * Register a watch on the given path/path2, using the given xenbus_watch
  * structure for storage, and the given callback function as the callback.
diff --git a/sys/arch/xen/xenbus/xenbus_client.c b/sys/arch/xen/xenbus/xenbus_client.c
index be841003bdc4..01c1631b8587 100644
--- a/sys/arch/xen/xenbus/xenbus_client.c
+++ b/sys/arch/xen/xenbus/xenbus_client.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_client.c,v 1.14 2019/11/10 21:16:34 chs Exp $ */
+/* $NetBSD: xenbus_client.c,v 1.15 2020/04/07 13:38:50 jdolecek Exp $ */
 /******************************************************************************
  * Client-facing interface for the Xenbus driver.  In other words, the
  * interface between the Xenbus and the device-specific code, be it the
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenbus_client.c,v 1.14 2019/11/10 21:16:34 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenbus_client.c,v 1.15 2020/04/07 13:38:50 jdolecek Exp $");
 
 #if 0
 #define DPRINTK(fmt, args...) \
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: xenbus_client.c,v 1.14 2019/11/10 21:16:34 chs Exp $
 #include <xen/granttables.h>
 
 
-int
+static int
 xenbus_watch_path(struct xenbus_device *dev, char *path,
 		      struct xenbus_watch *watch, 
 		      void (*callback)(struct xenbus_watch *,