diff -up ovaldi-5.9.1-src/project/linux/Makefile.rpm46 ovaldi-5.9.1-src/project/linux/Makefile
--- ovaldi-5.9.1-src/project/linux/Makefile.rpm46	2010-08-27 15:23:41.000000000 -0400
+++ ovaldi-5.9.1-src/project/linux/Makefile	2011-05-11 09:40:47.217529843 -0400
@@ -59,7 +59,7 @@ SRC_DIRS = $(SRCDIR) $(LINUXDIR) $(UNIXP
 CPP_FILES := $(foreach d,$(SRC_DIRS),$(wildcard $(d)/*.cpp))
 
 ifneq (${PACKAGE_RPM}, )
-	LIBS += -lrpm -lrpmdb -lrpmio
+	LIBS += -lrpm -lrpmio
 	CPPFLAGS += -DPACKAGE_RPM
 	CPP_FILES := $(filter-out %DPKGInfoProbe.cpp, $(CPP_FILES))
 else ifneq (${PACKAGE_DPKG}, )
diff -up ovaldi-5.9.1-src/src/probes/linux/RPMInfoProbe.cpp.rpm46 ovaldi-5.9.1-src/src/probes/linux/RPMInfoProbe.cpp
--- ovaldi-5.9.1-src/src/probes/linux/RPMInfoProbe.cpp.rpm46	2011-02-04 22:41:10.000000000 -0500
+++ ovaldi-5.9.1-src/src/probes/linux/RPMInfoProbe.cpp	2011-05-11 09:39:11.855697122 -0400
@@ -378,11 +378,11 @@ void RPMInfoProbe::GetRPMInfo(string nam
   rpmtsFree(ts);
 }
 
-char* RPMInfoProbe::readHeaderString(Header header, int_32 tag_id) {
+char* RPMInfoProbe::readHeaderString(Header header, rpmTag tag_id) {
   // This function is from the Red Hat RPM Guide //
-  int_32 type;
+  rpmTagType type;
   void *pointer;
-  int_32 data_size;
+  rpm_count_t data_size;
 
   int header_status = headerGetEntry(header,
 				     tag_id,
@@ -400,11 +400,11 @@ char* RPMInfoProbe::readHeaderString(Hea
   return (NULL);
 }
 
-int_32 RPMInfoProbe::readHeaderInt32(Header header, int_32 tag_id) {
+int_32 RPMInfoProbe::readHeaderInt32(Header header, rpmTag tag_id) {
   // This function is from the Red Hat RPM Guide //
-  int_32 type;
+  rpmTagType type;
   void *pointer;
-  int_32 data_size;
+  rpm_count_t data_size;
 
   int header_status = headerGetEntry(header,
 				     tag_id,
@@ -495,7 +495,7 @@ void RPMInfoProbe::ChildGetSigKeyId(int 
             fprintf(stderr, "no arguments given for --query");
             exit(EXIT_FAILURE);
 		}
-        ec = rpmcliQuery(ts, qva, (const char **) poptGetArgs(context));
+        ec = rpmcliQuery(ts, qva, (char * const *) poptGetArgs(context));
 
 	} else {
 		cerr << "Unable to get sig key id for rpm: " << rpmName << endl;        
diff -up ovaldi-5.9.1-src/src/probes/linux/RPMInfoProbe.h.rpm46 ovaldi-5.9.1-src/src/probes/linux/RPMInfoProbe.h
--- ovaldi-5.9.1-src/src/probes/linux/RPMInfoProbe.h.rpm46	2011-02-04 22:41:10.000000000 -0500
+++ ovaldi-5.9.1-src/src/probes/linux/RPMInfoProbe.h	2011-05-11 09:39:11.855697122 -0400
@@ -110,8 +110,8 @@ private:
 	string GetSigKeyId(string rpmName);
 
 	string readHeaderBinary(Header header, int_32 tag_id);
-	char *readHeaderString(Header header, int_32 tag_id);
-	int_32 readHeaderInt32(Header header, int_32 tag_id);
+	char *readHeaderString(Header header, rpmTag tag_id);
+	int_32 readHeaderInt32(Header header, rpmTag tag_id);
 
 	static RPMInfoProbe *instance;
 };