diff --git a/ChangeLog b/ChangeLog
index 3744da2c5fce483f23719ad6c38baeeec45b91e4..6ee8deac579ef9fbb4d0eac56849aafce8367c9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Dec 18 11:56:58 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	Use pid_t for all PID tracking variables (John Levon)
+	* src/openvz_driver.c, src/proxy_internal.h, src/remote_internal.c,
+	src/storage_backend.c, src/uml_driver.c, src/util.c, src/util.h:
+	s/int/pid_t/
+
 Thu Dec 18 11:54:58 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* qemud/Makefile.am: Don't munge default network XML if
diff --git a/src/openvz_driver.c b/src/openvz_driver.c
index 290ef850614f1d7030ea7f35f44e8eebea07de11..284ffb2e6db486c14850e8d7802b9bd4d0c34ead 100644
--- a/src/openvz_driver.c
+++ b/src/openvz_driver.c
@@ -1102,7 +1102,8 @@ static char *openvzGetCapabilities(virConnectPtr conn) {
 
 static int openvzListDomains(virConnectPtr conn, int *ids, int nids) {
     int got = 0;
-    int veid, pid;
+    int veid;
+    pid_t pid;
     int outfd = -1;
     int errfd = -1;
     int ret;
@@ -1153,7 +1154,8 @@ static int openvzNumDomains(virConnectPtr conn) {
 static int openvzListDefinedDomains(virConnectPtr conn,
                                     char **const names, int nnames) {
     int got = 0;
-    int veid, pid, outfd = -1, errfd = -1, ret;
+    int veid, outfd = -1, errfd = -1, ret;
+    pid_t pid;
     char vpsname[32];
     char buf[32];
     char *endptr;
diff --git a/src/proxy_internal.c b/src/proxy_internal.c
index ab976afe6fd4bcc07aaeafedf42c709ecbcbda06..5909220a8bd5952393c770eca37c06cd006f5ca9 100644
--- a/src/proxy_internal.c
+++ b/src/proxy_internal.c
@@ -144,7 +144,8 @@ static int
 virProxyForkServer(void)
 {
     const char *proxyPath = virProxyFindServerPath();
-    int ret, pid, status;
+    int ret, status;
+    pid_t pid;
     const char *proxyarg[2];
 
     if (!proxyPath) {
diff --git a/src/remote_internal.c b/src/remote_internal.c
index 45ecbc295a744f92aac0354e9549c518267392c5..fcff3cd6ca0b7df2dd27e846237f6edbb0cd4997 100644
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -252,7 +252,8 @@ remoteForkDaemon(virConnectPtr conn)
 {
     const char *daemonPath = remoteFindDaemonPath();
     const char *const daemonargs[] = { daemonPath, "--timeout=30", NULL };
-    int ret, pid, status;
+    int ret, status;
+    pid_t pid;
 
     if (!daemonPath) {
         error(conn, VIR_ERR_INTERNAL_ERROR, _("failed to find libvirtd binary"));
diff --git a/src/storage_backend.c b/src/storage_backend.c
index bb247271c13e3caf50bb2510f38fa797d2cce14c..3d1bbd15ea1856f0ff1ba6675f537c9c09f8a814 100644
--- a/src/storage_backend.c
+++ b/src/storage_backend.c
@@ -411,7 +411,8 @@ virStorageBackendRunProgRegex(virConnectPtr conn,
                               void *data,
                               int *outexit)
 {
-    int child = 0, fd = -1, exitstatus, err, failed = 1;
+    int fd = -1, exitstatus, err, failed = 1;
+    pid_t child = 0;
     FILE *list = NULL;
     regex_t *reg;
     regmatch_t *vars = NULL;
@@ -575,7 +576,8 @@ virStorageBackendRunProgNul(virConnectPtr conn,
                             void *data)
 {
     size_t n_tok = 0;
-    int child = 0, fd = -1, exitstatus;
+    int fd = -1, exitstatus;
+    pid_t child = 0;
     FILE *fp = NULL;
     char **v;
     int err = -1;
diff --git a/src/uml_driver.c b/src/uml_driver.c
index 408096e636ba9d7ee3510a798efd8cf84f75cca6..0a59a2f08576667870d44b93cbc5f4687099b898 100644
--- a/src/uml_driver.c
+++ b/src/uml_driver.c
@@ -711,7 +711,8 @@ static int umlStartVMDaemon(virConnectPtr conn,
                             virDomainObjPtr vm) {
     const char **argv = NULL, **tmp;
     const char **progenv = NULL;
-    int i, ret, pid;
+    int i, ret;
+    pid_t pid;
     char *logfile;
     int logfd = -1;
     struct stat sb;
diff --git a/src/util.c b/src/util.c
index 904f659566966aaf443b1dc7fd8d01093820ed70..b0e1a9ad9c58745d358622a2a5b6bd23efe334c9 100644
--- a/src/util.c
+++ b/src/util.c
@@ -182,10 +182,11 @@ __virExec(virConnectPtr conn,
           const char *const*argv,
           const char *const*envp,
           const fd_set *keepfd,
-          int *retpid,
+          pid_t *retpid,
           int infd, int *outfd, int *errfd,
           int flags) {
-    int pid, null, i, openmax;
+    pid_t pid;
+    int null, i, openmax;
     int pipeout[2] = {-1,-1};
     int pipeerr[2] = {-1,-1};
     int childout = -1;
@@ -439,7 +440,7 @@ virExec(virConnectPtr conn,
         const char *const*argv,
         const char *const*envp,
         const fd_set *keepfd,
-        int *retpid,
+        pid_t *retpid,
         int infd, int *outfd, int *errfd,
         int flags) {
     char *argv_str;
@@ -554,7 +555,8 @@ int
 virRun(virConnectPtr conn,
        const char *const*argv,
        int *status) {
-    int childpid, exitstatus, execret, waitret;
+    pid_t childpid;
+    int exitstatus, execret, waitret;
     int ret = -1;
     int errfd = -1, outfd = -1;
     char *outbuf = NULL;
diff --git a/src/util.h b/src/util.h
index 0475bd3569d66d75ea50fde6467f00604084e6b5..316ac4fc91453fc6c076ab17ca240ac4425286b5 100644
--- a/src/util.h
+++ b/src/util.h
@@ -27,6 +27,7 @@
 
 #include "verify.h"
 #include <sys/select.h>
+#include <sys/types.h>
 
 int saferead(int fd, void *buf, size_t count);
 ssize_t safewrite(int fd, const void *buf, size_t count);
@@ -41,7 +42,7 @@ int virExec(virConnectPtr conn,
             const char *const*argv,
             const char *const*envp,
             const fd_set *keepfd,
-            int *retpid,
+            pid_t *retpid,
             int infd,
             int *outfd,
             int *errfd,