diff --git a/src/emu/machine/8042kbdc.c b/src/emu/machine/8042kbdc.c
index ade97fe4a0c..98c936c22d8 100644
--- a/src/emu/machine/8042kbdc.c
+++ b/src/emu/machine/8042kbdc.c
@@ -597,26 +597,26 @@ WRITE8_HANDLER(kbdc8042_8_w)
 
 READ32_HANDLER( kbdc8042_32le_r )
 {
-	return read32le_with_read8_handler(kbdc8042_8_r, space->machine, offset, mem_mask);
+	return read32le_with_read8_handler(kbdc8042_8_r, space, offset, mem_mask);
 }
 
 
 
 WRITE32_HANDLER( kbdc8042_32le_w )
 {
-	write32le_with_write8_handler(kbdc8042_8_w, space->machine, offset, data, mem_mask);
+	write32le_with_write8_handler(kbdc8042_8_w, space, offset, data, mem_mask);
 }
 
 
 
 READ64_HANDLER( kbdc8042_64be_r )
 {
-	return read64be_with_read8_handler(kbdc8042_8_r, space->machine, offset, mem_mask);
+	return read64be_with_read8_handler(kbdc8042_8_r, space, offset, mem_mask);
 }
 
 
 
 WRITE64_HANDLER( kbdc8042_64be_w )
 {
-	write64be_with_write8_handler(kbdc8042_8_w, space->machine, offset, data, mem_mask);
+	write64be_with_write8_handler(kbdc8042_8_w, space, offset, data, mem_mask);
 }
diff --git a/src/emu/machine/pci.c b/src/emu/machine/pci.c
index f0cefbc42ed..62055a9e108 100644
--- a/src/emu/machine/pci.c
+++ b/src/emu/machine/pci.c
@@ -193,5 +193,5 @@ WRITE32_HANDLER(pci_32le_w)
 
 
 
-READ64_HANDLER(pci_64be_r) { return read64be_with_32le_handler(pci_32le_r, space->machine, offset, mem_mask); }
-WRITE64_HANDLER(pci_64be_w) { write64be_with_32le_handler(pci_32le_w, space->machine, offset, data, mem_mask); }
+READ64_HANDLER(pci_64be_r) { return read64be_with_32le_handler(pci_32le_r, space, offset, mem_mask); }
+WRITE64_HANDLER(pci_64be_w) { write64be_with_32le_handler(pci_32le_w, space, offset, data, mem_mask); }