diff --git a/hw/xbox/lpc47m157.c b/hw/xbox/lpc47m157.c
index b40176c380..209aa79490 100644
--- a/hw/xbox/lpc47m157.c
+++ b/hw/xbox/lpc47m157.c
@@ -75,7 +75,8 @@ static void update_devices(LPC47M157State *s)
     ISADevice *isadev = ISA_DEVICE(s);
     
     /* init serial devices */
-    for (int i=0; i<2; i++) {
+    int i;
+    for (i=0; i<2; i++) {
         uint8_t *dev = s->device_regs[DEVICE_SERIAL_PORT_1 + i];
         if (dev[CONFIG_DEVICE_ACTIVATE] && !s->serial[i].active) {
             
@@ -182,7 +183,8 @@ static void lpc47m157_realize(DeviceState *dev, Error **errp)
     isa_register_ioport(isa, &s->io, iobase);
 
     /* init serial cores */
-    for (int i=0; i<2; i++) {
+    int i;
+    for (i=0; i<2; i++) {
         CharDriverState *chr = serial_hds[i];
         if (chr == NULL) {
             char name[5];
diff --git a/hw/xbox/swizzle.c b/hw/xbox/swizzle.c
index e988a7797c..cfb8bb3c13 100644
--- a/hw/xbox/swizzle.c
+++ b/hw/xbox/swizzle.c
@@ -26,7 +26,7 @@
 
 #include "hw/xbox/swizzle.h"
 
-static unsigned int log2(unsigned int i)
+static unsigned int log2i(unsigned int i)
 {
     unsigned int r = 0;
     while (i >>= 1) r++;
@@ -38,7 +38,7 @@ static unsigned int get_swizzled_offset(
     unsigned int width, unsigned int height,
     unsigned int bytes_per_pixel)
 {
-    unsigned int k = log2(MIN(width, height));
+    unsigned int k = log2i(MIN(width, height));
 
     unsigned int u = (x & 0x001) << 0 |
         (x & 0x002) << 1 |