diff --git a/src/topology/data.c b/src/topology/data.c
index 972b4b7a..22c0b5d8 100644
--- a/src/topology/data.c
+++ b/src/topology/data.c
@@ -414,7 +414,7 @@ static int write_hex(char *buf, char *str, int width)
 	void *p = &val;
 
         errno = 0;
-	if (safe_strtol_base(str, &val, 16) < 0)
+	if (tplg_safe_strtol_base(str, &val, 16) < 0)
 		return -EINVAL;
 
 	switch (width) {
diff --git a/src/topology/ops.c b/src/topology/ops.c
index daab3577..91764f5b 100644
--- a/src/topology/ops.c
+++ b/src/topology/ops.c
@@ -43,7 +43,7 @@ static int lookup_ops(const char *c)
 	}
 
 	/* cant find string name in our table so we use its ID number */
-	i = safe_strtol(c, &ret);
+	i = tplg_safe_strtol(c, &ret);
 	if (i < 0) {
 		SNDERR("wrong kcontrol ops value string '%s'", c);
 		return i;
diff --git a/src/topology/parser.c b/src/topology/parser.c
index 01c95afa..a2f06de4 100644
--- a/src/topology/parser.c
+++ b/src/topology/parser.c
@@ -24,7 +24,7 @@
 /*
  * Safe strtol call
  */
-int safe_strtol_base(const char *str, long *val, int base)
+int tplg_safe_strtol_base(const char *str, long *val, int base)
 {
 	char *end;
 	long v;
@@ -59,7 +59,7 @@ int tplg_get_integer(snd_config_t *n, int *val, int base)
 		err = snd_config_get_string(n, &str);
 		if (err < 0)
 			return err;
-		err = safe_strtol_base(str, &lval, base);
+		err = tplg_safe_strtol_base(str, &lval, base);
 		if (err < 0)
 			return err;
 		goto __retval;
diff --git a/src/topology/tplg_local.h b/src/topology/tplg_local.h
index 1cb8b694..15b36238 100644
--- a/src/topology/tplg_local.h
+++ b/src/topology/tplg_local.h
@@ -407,6 +407,9 @@ int tplg_save_stream_caps(snd_tplg_t *tplg, struct tplg_elem *elem,
 int tplg_save_dai(snd_tplg_t *tplg, struct tplg_elem *elem,
 		  struct tplg_buf *dst, const char *pfx);
 
+int tplg_safe_strtol_base(const char *str, long *val, int base);
+static inline int tplg_safe_strtol(const char *str, long *val) { return tplg_safe_strtol_base(str, val, 0); }
+
 int tplg_decode_template(snd_tplg_t *tplg,
 			 size_t pos,
 			 struct snd_soc_tplg_hdr *hdr,