diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index f3030b1049..fd27601f28 100644
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -123,7 +123,8 @@ cleanup:
 static int virLXCCgroupSetupBlkioTune(virDomainDefPtr def,
                                       virCgroupPtr cgroup)
 {
-    int i, rc;
+    size_t i;
+    int rc;
 
     if (def->blkio.weight) {
         rc = virCgroupSetBlkioWeight(cgroup, def->blkio.weight);
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index eb86338048..257cf93360 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -229,7 +229,8 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef)
 static int lxcContainerSetStdio(int control, int ttyfd, int handshakefd)
 {
     int rc = -1;
-    int open_max, i;
+    int open_max;
+    int fd;
 
     if (setsid() < 0) {
         virReportSystemError(errno, "%s",
@@ -246,9 +247,9 @@ static int lxcContainerSetStdio(int control, int ttyfd, int handshakefd)
     /* Just in case someone forget to set FD_CLOEXEC, explicitly
      * close all FDs before executing the container */
     open_max = sysconf(_SC_OPEN_MAX);
-    for (i = 0; i < open_max; i++)
-        if (i != ttyfd && i != control && i != handshakefd) {
-            int tmpfd = i;
+    for (fd = 0; fd < open_max; fd++)
+        if (fd != ttyfd && fd != control && fd != handshakefd) {
+            int tmpfd = fd;
             VIR_MASS_CLOSE(tmpfd);
         }
 
@@ -701,7 +702,8 @@ static int lxcContainerMountBasicFS(void)
         { SELINUX_MOUNT, SELINUX_MOUNT, NULL, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY },
 #endif
     };
-    int i, rc = -1;
+    size_t i;
+    int rc = -1;
 
     VIR_DEBUG("Mounting basic filesystems");
 
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 4471abfb8c..3f3d93b6ca 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -1141,7 +1141,8 @@ virLXCControllerSetupUsernsMap(virDomainIdMapEntryPtr map,
                                char *path)
 {
     virBuffer map_value = VIR_BUFFER_INITIALIZER;
-    int i, ret = -1;
+    size_t i;
+    int ret = -1;
 
     for (i = 0; i < num; i++)
         virBufferAsprintf(&map_value, "%u %u %u\n",
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 3504dbaa9d..1279edfaa6 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -815,7 +815,7 @@ lxcDomainSetMemoryParameters(virDomainPtr dom,
                              unsigned int flags)
 {
     virLXCDriverPtr driver = dom->conn->privateData;
-    int i;
+    size_t i;
     virDomainObjPtr vm = NULL;
     int ret = -1;
     int rc;
@@ -889,7 +889,7 @@ lxcDomainGetMemoryParameters(virDomainPtr dom,
                              unsigned int flags)
 {
     virLXCDriverPtr driver = dom->conn->privateData;
-    int i;
+    size_t i;
     virDomainObjPtr vm = NULL;
     unsigned long long val;
     int ret = -1;
@@ -1846,7 +1846,7 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom,
                                      unsigned int flags)
 {
     virLXCDriverPtr driver = dom->conn->privateData;
-    int i;
+    size_t i;
     virDomainObjPtr vm = NULL;
     virDomainDefPtr vmdef = NULL;
     int ret = -1;
@@ -2101,7 +2101,7 @@ lxcDomainSetBlkioParameters(virDomainPtr dom,
                             unsigned int flags)
 {
     virLXCDriverPtr driver = dom->conn->privateData;
-    int i;
+    size_t i;
     virDomainObjPtr vm = NULL;
     virDomainDefPtr persistentDef = NULL;
     int ret = -1;
@@ -2200,7 +2200,7 @@ lxcDomainGetBlkioParameters(virDomainPtr dom,
                             unsigned int flags)
 {
     virLXCDriverPtr driver = dom->conn->privateData;
-    int i;
+    size_t i;
     virDomainObjPtr vm = NULL;
     virDomainDefPtr persistentDef = NULL;
     unsigned int val;
@@ -2305,7 +2305,7 @@ lxcDomainInterfaceStats(virDomainPtr dom,
 {
     virLXCDriverPtr driver = dom->conn->privateData;
     virDomainObjPtr vm;
-    int i;
+    size_t i;
     int ret = -1;
 
     lxcDriverLock(driver);
@@ -3857,7 +3857,7 @@ lxcDomainDetachDeviceDiskLive(virDomainObjPtr vm,
 {
     virLXCDomainObjPrivatePtr priv = vm->privateData;
     virDomainDiskDefPtr def = NULL;
-    int i, ret = -1;
+    int idx, ret = -1;
     char *dst = NULL;
 
     if (!priv->initpid) {
@@ -3866,15 +3866,15 @@ lxcDomainDetachDeviceDiskLive(virDomainObjPtr vm,
         goto cleanup;
     }
 
-    if ((i = virDomainDiskIndexByName(vm->def,
-                                      dev->data.disk->dst,
-                                      false)) < 0) {
+    if ((idx = virDomainDiskIndexByName(vm->def,
+                                        dev->data.disk->dst,
+                                        false)) < 0) {
         virReportError(VIR_ERR_OPERATION_FAILED,
                        _("disk %s not found"), dev->data.disk->dst);
         goto cleanup;
     }
 
-    def = vm->def->disks[i];
+    def = vm->def->disks[idx];
 
     if (virAsprintf(&dst, "/proc/%llu/root/dev/%s",
                     (unsigned long long)priv->initpid, def->dst) < 0)
@@ -3899,7 +3899,7 @@ lxcDomainDetachDeviceDiskLive(virDomainObjPtr vm,
         VIR_WARN("cannot deny device %s for domain %s",
                  def->src, vm->def->name);
 
-    virDomainDiskRemove(vm->def, i);
+    virDomainDiskRemove(vm->def, idx);
     virDomainDiskDefFree(def);
 
     ret = 0;
@@ -4051,7 +4051,7 @@ lxcDomainDetachDeviceHostdevStorageLive(virDomainObjPtr vm,
 {
     virLXCDomainObjPrivatePtr priv = vm->privateData;
     virDomainHostdevDefPtr def = NULL;
-    int i, ret = -1;
+    int idx, ret = -1;
     char *dst = NULL;
 
     if (!priv->initpid) {
@@ -4060,9 +4060,9 @@ lxcDomainDetachDeviceHostdevStorageLive(virDomainObjPtr vm,
         goto cleanup;
     }
 
-    if ((i = virDomainHostdevFind(vm->def,
-                                  dev->data.hostdev,
-                                  &def)) < 0) {
+    if ((idx = virDomainHostdevFind(vm->def,
+                                    dev->data.hostdev,
+                                    &def)) < 0) {
         virReportError(VIR_ERR_OPERATION_FAILED,
                        _("hostdev %s not found"),
                        dev->data.hostdev->source.caps.u.storage.block);
@@ -4093,7 +4093,7 @@ lxcDomainDetachDeviceHostdevStorageLive(virDomainObjPtr vm,
         VIR_WARN("cannot deny device %s for domain %s",
                  def->source.caps.u.storage.block, vm->def->name);
 
-    virDomainHostdevRemove(vm->def, i);
+    virDomainHostdevRemove(vm->def, idx);
     virDomainHostdevDefFree(def);
 
     ret = 0;
@@ -4110,7 +4110,7 @@ lxcDomainDetachDeviceHostdevMiscLive(virDomainObjPtr vm,
 {
     virLXCDomainObjPrivatePtr priv = vm->privateData;
     virDomainHostdevDefPtr def = NULL;
-    int i, ret = -1;
+    int idx, ret = -1;
     char *dst = NULL;
 
     if (!priv->initpid) {
@@ -4119,9 +4119,9 @@ lxcDomainDetachDeviceHostdevMiscLive(virDomainObjPtr vm,
         goto cleanup;
     }
 
-    if ((i = virDomainHostdevFind(vm->def,
-                                  dev->data.hostdev,
-                                  &def)) < 0) {
+    if ((idx = virDomainHostdevFind(vm->def,
+                                    dev->data.hostdev,
+                                    &def)) < 0) {
         virReportError(VIR_ERR_OPERATION_FAILED,
                        _("hostdev %s not found"),
                        dev->data.hostdev->source.caps.u.misc.chardev);
@@ -4152,7 +4152,7 @@ lxcDomainDetachDeviceHostdevMiscLive(virDomainObjPtr vm,
         VIR_WARN("cannot deny device %s for domain %s",
                  def->source.caps.u.misc.chardev, vm->def->name);
 
-    virDomainHostdevRemove(vm->def, i);
+    virDomainHostdevRemove(vm->def, idx);
     virDomainHostdevDefFree(def);
 
     ret = 0;
diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 6f74bd2a04..396e0ebffd 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -221,7 +221,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver,
                                  virDomainObjPtr vm,
                                  virDomainShutoffReason reason)
 {
-    int i;
+    size_t i;
     virLXCDomainObjPrivatePtr priv = vm->privateData;
     virNetDevVPortProfilePtr vport = NULL;