1 files changed, 3 insertions, 17 deletions

diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h
index 418d3f61..546a2820 100644
--- a/lib/libalpm/conflict.h
+++ b/lib/libalpm/conflict.h
@@ -24,26 +24,12 @@
 #include "db.h"
 #include "package.h"
 
-struct __pmconflict_t {
-	char *package1;
-	char *package2;
-	char *reason;
-};
-
-struct __pmfileconflict_t {
-	char *target;
-	pmfileconflicttype_t type;
-	char *file;
-	char *ctarget;
-};
-
-pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2, const char *reason);
 pmconflict_t *_alpm_conflict_dup(const pmconflict_t *conflict);
 void _alpm_conflict_free(pmconflict_t *conflict);
-alpm_list_t *_alpm_innerconflicts(alpm_list_t *packages);
+alpm_list_t *_alpm_innerconflicts(pmhandle_t *handle, alpm_list_t *packages);
 alpm_list_t *_alpm_outerconflicts(pmdb_t *db, alpm_list_t *packages);
-alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
-					 alpm_list_t *upgrade, alpm_list_t *remove);
+alpm_list_t *_alpm_db_find_fileconflicts(pmhandle_t *handle,
+		alpm_list_t *upgrade, alpm_list_t *remove);
 
 void _alpm_fileconflict_free(pmfileconflict_t *conflict);