diff --git a/src/hwm.c b/src/hwm.c
index 7f3ac49d6..b3142c7a4 100644
--- a/src/hwm.c
+++ b/src/hwm.c
@@ -14,6 +14,7 @@
  *		Copyright 2020 RichardG.
  */
 
+#include <stdint.h>
 #include "device.h"
 #include "hwm.h"
 
diff --git a/src/intel_piix.c b/src/intel_piix.c
index 96ecb5c80..3ad177051 100644
--- a/src/intel_piix.c
+++ b/src/intel_piix.c
@@ -35,6 +35,7 @@
 #include "device.h"
 #include "apm.h"
 #include "keyboard.h"
+#include "machine.h"
 #include "mem.h"
 #include "timer.h"
 #include "nvr.h"
@@ -1209,6 +1210,7 @@ static void
 *piix_init(const device_t *info)
 {
     int i;
+    CPU *cpu_s = &machines[machine].cpu[cpu_manufacturer].cpus[cpu];
 
     piix_t *dev = (piix_t *) malloc(sizeof(piix_t));
     memset(dev, 0, sizeof(piix_t));
diff --git a/src/scsi/scsi_ncr53c8xx.c b/src/scsi/scsi_ncr53c8xx.c
index 5ddb22638..77c9d0143 100644
--- a/src/scsi/scsi_ncr53c8xx.c
+++ b/src/scsi/scsi_ncr53c8xx.c
@@ -447,7 +447,7 @@ ncr53c8xx_soft_reset(ncr53c8xx_t *dev)
 	for (i = 0; i < 8; i++) {
 #ifdef USE_WDTR
 		dev->tr_set[i] = 0;
-#Endif
+#endif
 		scsi_device_reset(&scsi_devices[i]);
 	}
     }