--- db3/db_server_svc.c
+++ db3/db_server_svc.c
@@ -35,6 +35,7 @@
 static int _rpcpmstart;		/* Started by a port monitor ? */
 static int _rpcfdtype;		/* Whether Stream or Datagram ? */
 static int _rpcsvcdirty;	/* Still serving ? */
+extern void __dbsrv_timeout();
 
 static
 void _msgout(char* msg)
--- lib/rpmfi.h
+++ lib/rpmfi.h
@@ -6,6 +6,8 @@
  * Structure(s) used for file info tag sets.
  */
 
+int dodigest(int digestalgo, const char * fn, unsigned char * digest, int asAscii, size_t *fsizep);
+
 /*@-exportlocal@*/
 /*@unchecked@*/
 extern int _rpmfi_debug;
--- lib/rpmrc.c
+++ lib/rpmrc.c
@@ -23,6 +23,8 @@
 #include "misc.h"
 #include "debug.h"
 
+extern int rpmioSlurp(const char * fn, const unsigned char ** bp, ssize_t * blenp);
+
 /*@observer@*/ /*@checked@*/
 const char *rpmRcfiles = LIBRPMRC_FILENAME ":" VENDORRPMRC_FILENAME ":/etc/rpmrc:~/.rpmrc"; 
 
--- perl/RPM.c
+++ perl/RPM.c
@@ -25,6 +25,8 @@
 #include "perl.h"
 #include "XSUB.h"
 
+#include "../lib/rpmevr.h"
+
 #if !defined(RPM_RPM41) && !defined(RPM_RPM40)
 #error Must define one of RPM_RPM41 or RPM_RPM40; perhaps Makefile.PL could not guess your RPM API version?
 #endif
@@ -251,7 +253,7 @@ XS(XS_RPM_rpmvercmp)
 	int	RETVAL;
 	dXSTARG;
 
-	RETVAL = rpmvercmp(one, two);
+	RETVAL = rpmEVRcmp(one, two);
 	XSprePUSH; PUSHi((IV)RETVAL);
     }
     XSRETURN(1);
--- python/Makefile.in
+++ python/Makefile.in
@@ -152,7 +152,7 @@ LIBMISC = @LIBMISC@
 LIBOBJS = @LIBOBJS@
 LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@
 LIBRPMRC_FILENAME = @LIBRPMRC_FILENAME@
-LIBS = @LIBS@
+LIBS = @LIBS@ -lpython2.7 -lintl -ldl -framework CoreFoundation
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALEDIR = @LOCALEDIR@
--- rpmio/envvar.h
+++ rpmio/envvar.h
@@ -9,6 +9,8 @@
 extern "C" {
 #endif
 
+int clearenv (void);
+
 /*@unused@*/
 static inline
 /*@observer@*/ /*@null@*/
--- rpmio/rpmio_internal.h
+++ rpmio/rpmio_internal.h
@@ -34,6 +34,8 @@
 #include <sha512.h>
 #endif
 
+int davFree(urlinfo u);
+
 /** \ingroup rpmio
  * Values parsed from OpenPGP signature/pubkey packet(s).
  */