diff -up ./apt-pkg/rpm/raptheader.h.tv ./apt-pkg/rpm/raptheader.h
--- ./apt-pkg/rpm/raptheader.h.tv	2019-09-16 15:06:31.869881741 +0200
+++ ./apt-pkg/rpm/raptheader.h	2019-09-16 15:06:39.905053258 +0200
@@ -6,12 +6,8 @@
 
 #include "rapttypes.h"
 
-#ifndef HAVE_RPM_RPMTAG_H
-#include <rpm/rpmlib.h>
-#else
 #include <rpm/header.h>
 #include <rpm/rpmtag.h>
-#endif
 
 using std::vector;
 using std::string;
diff -up ./configure.ac.tv ./configure.ac
--- ./configure.ac.tv	2019-09-16 15:09:53.716201626 +0200
+++ ./configure.ac	2019-09-16 15:10:29.080959587 +0200
@@ -94,8 +94,8 @@ if test -z "$RPM_LIBS"; then
 fi
 
 dnl Various rpm header checks..
-AC_CHECK_HEADER(rpm/rpmlib.h, [],
-	   [AC_MSG_ERROR([Can't find rpmlib.h])])
+AC_CHECK_HEADER(rpm/rpmtag.h, [],
+	   [AC_MSG_ERROR([Can't find rpmtag.h])])
 AC_CHECK_HEADERS([rpm/rpmsx.h rpm/rpmcallback.h rpm/rpmcb.h \
 	     rpm/rpmmessages.h rpm/rpmevr.h rpm/rpmtypes.h rpm/rpmtd.h])
 
@@ -120,8 +120,8 @@ AC_EGREP_HEADER(rpmdsRpmlib, rpm/rpmds.h
 	[AC_MSG_RESULT(no) ])
 	
 AC_MSG_CHECKING(for fdigests)
-AC_EGREP_HEADER(RPMTRANS_FLAG_NOFDIGESTS, rpm/rpmlib.h,
-	[AC_MSG_RESULT(yes) AC_DEFINE(RPM_HAVE_FDIGESTS, 1, [fdigests]) ],
+AC_EGREP_HEADER(RPMTRANS_FLAG_NOFDIGESTS, rpm/rpmtag.h,
+	[AC_MSG_RESULT(yes) AC_DEFINE(RPM_HAVE_FDIGESTS, 1, [rpmTagVal]) ],
 	[AC_MSG_RESULT(no) ])
 
 dnl Can we use g++ hash_map?
diff -up ./tools/Makefile.am.tv ./tools/Makefile.am
--- ./tools/Makefile.am.tv	2019-09-16 15:10:55.224519912 +0200
+++ ./tools/Makefile.am	2019-09-16 15:32:19.073067378 +0200
@@ -6,7 +6,7 @@ bin_SCRIPTS = genbasedir apt-pbo
 EXTRA_DIST = genbasedir
 
 LDADD = ../apt-pkg/libapt-pkg.la $(RPM_LIBS)
-AM_CPPFLAGS=-D_RPM_4_4_COMPAT
+AM_CPPFLAGS=
 
 genpkglist_SOURCES = genpkglist.cc cached_md5.cc cached_md5.h genutil.h
 gensrclist_SOURCES = gensrclist.cc cached_md5.cc cached_md5.h genutil.h