diff --git a/source/cart_hw/eeprom.c b/source/cart_hw/eeprom.c
index da6ca45..10387b0 100644
--- a/source/cart_hw/eeprom.c
+++ b/source/cart_hw/eeprom.c
@@ -1,6 +1,6 @@
 /****************************************************************************
  *  Genesis Plus
- *  Serial EEPROM support
+ *  I2C EEPROM support
  *
  *  Copyright (C) 2007, 2008, 2009  Eke-Eke (GCN/Wii port)
  *
diff --git a/source/cart_hw/eeprom.h b/source/cart_hw/eeprom.h
index 518a262..cd47b4f 100644
--- a/source/cart_hw/eeprom.h
+++ b/source/cart_hw/eeprom.h
@@ -1,6 +1,6 @@
 /****************************************************************************
  *  Genesis Plus
- *  Serial EEPROM support
+ *  I2C EEPROM support
  *
  *  Copyright (C) 2007, 2008, 2009  Eke-Eke (GCN/Wii port)
  *
diff --git a/source/mem68k.c b/source/mem68k.c
index e858b2b..2522533 100644
--- a/source/mem68k.c
+++ b/source/mem68k.c
@@ -1,6 +1,6 @@
 /***************************************************************************************
  *  Genesis Plus
- *  68k memory handlers
+ *  68k bus arbitration
  *
  *  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003  Charles Mac Donald (original code)
  *  Eke-Eke (2007,2008,2009), additional code & fixes for the GCN/Wii port
diff --git a/source/mem68k.h b/source/mem68k.h
index 35cd825..ca4efba 100644
--- a/source/mem68k.h
+++ b/source/mem68k.h
@@ -1,6 +1,6 @@
 /***************************************************************************************
  *  Genesis Plus
- *  68k memory handlers
+ *  68k bus arbitration
  *
  *  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003  Charles Mac Donald (original code)
  *  Eke-Eke (2007,2008,2009), additional code & fixes for the GCN/Wii port
diff --git a/source/membnk.c b/source/membnk.c
index b6d048f..3b616f2 100644
--- a/source/membnk.c
+++ b/source/membnk.c
@@ -1,6 +1,6 @@
 /***************************************************************************************
  *  Genesis Plus
- *  M68k Bank access from Z80
+ *  68k bus banked access from Z80
  *
  *  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003  Charles Mac Donald (original code)
  *  Eke-Eke (2007,2008,2009), additional code & fixes for the GCN/Wii port
diff --git a/source/membnk.h b/source/membnk.h
index 12cd153..a403a28 100644
--- a/source/membnk.h
+++ b/source/membnk.h
@@ -1,6 +1,6 @@
 /***************************************************************************************
  *  Genesis Plus
- *  M68k Bank access from Z80
+ *  68k bus banked access from Z80
  *
  *  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003  Charles Mac Donald (original code)
  *  Eke-Eke (2007,2008,2009), additional code & fixes for the GCN/Wii port
diff --git a/source/memz80.c b/source/memz80.c
index df4b628..649f4e5 100644
--- a/source/memz80.c
+++ b/source/memz80.c
@@ -1,6 +1,6 @@
 /***************************************************************************************
  *  Genesis Plus
- *  Z80 memory handler
+ *  Z80 bus arbitration (Genesis mode)
  *
  *  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003  Charles Mac Donald (original code)
  *  Eke-Eke (2007,2008,2009), additional code & fixes for the GCN/Wii port
diff --git a/source/memz80.h b/source/memz80.h
index 4a5c010..1223e08 100644
--- a/source/memz80.h
+++ b/source/memz80.h
@@ -1,6 +1,6 @@
 /***************************************************************************************
  *  Genesis Plus
- *  Z80 memory handler
+ *  Z80 bus arbitration (Genesis mode)
  *
  *  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003  Charles Mac Donald (original code)
  *  Eke-Eke (2007,2008,2009), additional code & fixes for the GCN/Wii port
@@ -23,4 +23,9 @@
 #ifndef _MEMZ80_H_
 #define _MEMZ80_H_
 
+extern unsigned int cpu_readmem16(unsigned int address);
+extern void cpu_writemem16(unsigned int address, unsigned int data);
+extern unsigned int cpu_readport16(unsigned int port);
+extern void cpu_writeport16(unsigned int port, unsigned int data);
+
 #endif /* _MEMZ80_H_ */
diff --git a/source/z80/z80.h b/source/z80/z80.h
index b9e4416..6f73123 100644
--- a/source/z80/z80.h
+++ b/source/z80/z80.h
@@ -2,6 +2,7 @@
 #define Z80_H_
 
 #include "cpuintrf.h"
+#include "memz80.h"
 
 enum
 {
@@ -51,10 +52,5 @@ void z80_get_context (void *dst);
 void z80_set_context (void *src);
 void z80_set_irq_line(int irqline, int state);
 
-unsigned int cpu_readport16(unsigned int port);
-void cpu_writeport16(unsigned int port, unsigned int data);
-unsigned int cpu_readmem16(unsigned int address);
-void cpu_writemem16(unsigned int address, unsigned int data);
-
 #endif