diff --git a/libpkgconf/argvsplit.c b/libpkgconf/argvsplit.c
index 830d500..d3ef07b 100644
--- a/libpkgconf/argvsplit.c
+++ b/libpkgconf/argvsplit.c
@@ -16,14 +16,14 @@
 #include <libpkgconf/libpkgconf.h>
 
 void
-pkg_argv_free(char **argv)
+pkgconf_argv_free(char **argv)
 {
 	free(argv[0]);
 	free(argv);
 }
 
 int
-pkg_argv_split(const char *src, int *argc, char ***argv)
+pkgconf_argv_split(const char *src, int *argc, char ***argv)
 {
 	char *buf = malloc(strlen(src) + 1);
 	const char *src_iter;
diff --git a/libpkgconf/fileio.c b/libpkgconf/fileio.c
index 0010009..d1c848f 100644
--- a/libpkgconf/fileio.c
+++ b/libpkgconf/fileio.c
@@ -16,7 +16,7 @@
 #include <libpkgconf/libpkgconf.h>
 
 char *
-pkg_fgetline(char *line, size_t size, FILE *stream)
+pkgconf_fgetline(char *line, size_t size, FILE *stream)
 {
 	char *s = line;
 	char *end = line + size - 1;
diff --git a/libpkgconf/fragment.c b/libpkgconf/fragment.c
index 297ccbd..7f0b679 100644
--- a/libpkgconf/fragment.c
+++ b/libpkgconf/fragment.c
@@ -196,11 +196,11 @@ pkgconf_fragment_parse(pkgconf_list_t *list, pkgconf_list_t *vars, const char *v
 	char **argv;
 	char *repstr = pkgconf_tuple_parse(vars, value);
 
-	pkg_argv_split(repstr, &argc, &argv);
+	pkgconf_argv_split(repstr, &argc, &argv);
 
 	for (i = 0; i < argc; i++)
 		pkgconf_fragment_add(list, argv[i], flags);
 
-	pkg_argv_free(argv);
+	pkgconf_argv_free(argv);
 	free(repstr);
 }
diff --git a/libpkgconf/libpkgconf.h b/libpkgconf/libpkgconf.h
index 854f90c..4d8fcad 100644
--- a/libpkgconf/libpkgconf.h
+++ b/libpkgconf/libpkgconf.h
@@ -155,8 +155,8 @@ void pkgconf_dependency_append(pkgconf_list_t *list, pkgconf_dependency_t *tail)
 void pkgconf_dependency_free(pkgconf_list_t *list);
 
 /* argvsplit.c */
-int pkg_argv_split(const char *src, int *argc, char ***argv);
-void pkg_argv_free(char **argv);
+int pkgconf_argv_split(const char *src, int *argc, char ***argv);
+void pkgconf_argv_free(char **argv);
 
 /* fragment.c */
 void pkgconf_fragment_parse(pkgconf_list_t *list, pkgconf_list_t *vars, const char *value, unsigned int flags);
@@ -166,7 +166,7 @@ void pkgconf_fragment_delete(pkgconf_list_t *list, pkgconf_fragment_t *node);
 void pkgconf_fragment_free(pkgconf_list_t *list);
 
 /* fileio.c */
-char *pkg_fgetline(char *line, size_t size, FILE *stream);
+char *pkgconf_fgetline(char *line, size_t size, FILE *stream);
 
 /* tuple.c */
 pkgconf_tuple_t *pkgconf_tuple_add(pkgconf_list_t *parent, const char *key, const char *value);
diff --git a/libpkgconf/pkg.c b/libpkgconf/pkg.c
index 0cf4d00..40a236a 100644
--- a/libpkgconf/pkg.c
+++ b/libpkgconf/pkg.c
@@ -212,7 +212,7 @@ pkg_new_from_file(const char *filename, FILE *f, unsigned int flags)
 	if (idptr)
 		*idptr = '\0';
 
-	while (pkg_fgetline(readbuf, PKG_BUFSIZE, f) != NULL)
+	while (pkgconf_fgetline(readbuf, PKG_BUFSIZE, f) != NULL)
 	{
 		char op, *p, *key, *value;