diff -r 008c75a5e08d -r 48e45439fd9a librazor/razor.h.in
--- a/librazor/razor.h.in	Mon Jul 04 10:48:18 2016 +0100
+++ b/librazor/razor.h.in	Mon Jul 04 13:04:19 2016 +0100
@@ -592,9 +592,6 @@
 
 struct razor_set *razor_importer_finish(struct razor_importer *importer);
 
-struct razor_set *razor_set_create_from_yum(void);
-struct razor_set *razor_set_create_from_rpmdb(void);
-
 /**
  * SECTION:root
  * @title: Root
@@ -650,6 +647,22 @@
 	int (*closedir)(void *dir, struct razor_error **error);
 };
 
+int razor_uri_mkdir(const char *uri, mode_t mode, struct razor_error **error);
+int razor_uri_unlink(const char *uri, struct razor_error **error);
+int razor_uri_open(const char *uri, int flags, mode_t mode,
+		   struct razor_error **error);
+int razor_uri_move(const char *uri, const char *dest,
+		   struct razor_error **error);
+int razor_uri_is_directory(const char *uri, struct razor_error **error);
+char *razor_uri_mkdtemp_near(const char *uri, const char *_template,
+			     struct razor_error **error) RAZOR_MALLOC;
+void *razor_uri_opendir(const char *uri, struct razor_error **error);
+char *razor_uri_readdir(void *dir, struct razor_error **error) RAZOR_MALLOC;
+int razor_uri_closedir(void *dir, struct razor_error **error);
+void *razor_uri_get_contents(const char *uri, size_t *length, int _private,
+			     struct razor_error **error);
+int razor_uri_free_contents(void *addr, size_t length);
+
 int razor_uri_set_vtable(const char *scheme, struct razor_uri_vtable *vtable,
 			 struct razor_error **error);
 
@@ -680,7 +693,7 @@
 char *razor_path_from_uri(const char *uri, struct razor_error **error)
       RAZOR_MALLOC;
 char *razor_path_to_uri(const char *path) RAZOR_MALLOC;
-char *razor_path_relative_to_uri(const char *file_uri, const char *path,
+char *razor_path_relative_to_uri(const char *uri, const char *path,
 				 struct razor_error **error) RAZOR_MALLOC;
 
 const char *razor_system_arch(void);