--- kde-2.2/kdeadmin/kpackage/rpmMessages.c.orig	Mon Aug 13 12:48:40 2001
+++ kde-2.2/kdeadmin/kpackage/rpmMessages.c	Mon Aug 13 12:48:48 2001
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 /* stupid RPM headers! */
-typedef __off64_t off64_t;
+/* typedef __off64_t off64_t; */
 #include <rpm/rpmlib.h>
 #include "rpmMessages.h"
 
--- kde-2.2/kdeadmin/kpackage/rpmInstall.cpp.orig	Mon Aug 13 14:23:00 2001
+++ kde-2.2/kdeadmin/kpackage/rpmInstall.cpp	Sat Jul 28 23:58:07 2001
@@ -11,7 +11,7 @@
 #include "rpmMessages.h"
 
 /* stupid RPM headers! */
-typedef __off64_t off64_t;
+/* typedef __off64_t off64_t; */
 #include <rpm/rpmlib.h>
 #undef	rpmErrorString
 #include "rpmInstall.h"
--- kde-2.2/kdeadmin/kpackage/rpmInterface.cpp.orig	Mon Aug 13 14:22:15 2001
+++ kde-2.2/kdeadmin/kpackage/rpmInterface.cpp	Mon Aug 13 14:22:21 2001
@@ -15,7 +15,7 @@
 
 #ifdef HAVE_RPM
 /* stupid RPM headers! */
-typedef __off64_t off64_t;
+/* typedef __off64_t off64_t; */
 #include <rpm/rpmlib.h>
 
 #include <rpm/rpmio.h>
--- kde-2.2/kdeadmin/kpackage/rpmInterface.h.orig	Mon Aug 13 14:21:34 2001
+++ kde-2.2/kdeadmin/kpackage/rpmInterface.h	Mon Aug 13 14:21:49 2001
@@ -13,7 +13,7 @@
 #ifdef HAVE_RPM
 #include <sys/types.h>
 /* stupid RPM headers! */
-typedef __off64_t off64_t;
+/* typedef __off64_t off64_t; */
 #include <rpm/rpmlib.h>
 #else
   typedef struct  Header{
--- kde-2.2/kdeadmin/kpackage/rpmVerify.cpp.orig	Mon Aug 13 14:23:16 2001
+++ kde-2.2/kdeadmin/kpackage/rpmVerify.cpp	Mon Aug 13 14:23:29 2001
@@ -8,7 +8,7 @@
 #include "rpmMessages.h"
 
 /* stupid RPM headers! */
-typedef __off64_t off64_t;
+/* typedef __off64_t off64_t; */
 #include <rpm/rpmlib.h>
 #include "rpmInstall.h"
 #include "rpmVerify.h"
--- kde-2.2/kdeadmin/kpackage/rpmutils.h.orig	Mon Aug 13 14:22:32 2001
+++ kde-2.2/kdeadmin/kpackage/rpmutils.h	Mon Aug 13 14:22:41 2001
@@ -6,7 +6,7 @@
 
 /* stupid RPM headers! */
 #include <sys/types.h>
-typedef __off64_t off64_t;
+/* typedef __off64_t off64_t; */
 #include <rpm/rpmlib.h>
 
 int findPackageByLabel(rpmdb db, const char *arg, dbiIndexSet *matches);
--- kde-2.2/kdeadmin/kwuftpd/ftpaccess.cpp.orig	Mon Aug 13 14:36:15 2001
+++ kde-2.2/kdeadmin/kwuftpd/ftpaccess.cpp	Mon Aug 13 14:36:28 2001
@@ -1,3 +1,7 @@
+#if defined(_AIX) && !defined(_AIX51)
+#include <strings.h>
+#endif
+
 #include <qtextstream.h>
 
 #include "ftpaccess.h"