diff --git a/tornado/fw/io.h b/tornado/fw/avr/io.h
similarity index 100%
rename from tornado/fw/io.h
rename to tornado/fw/avr/io.h
diff --git a/tornado/fw/ben/ben.c b/tornado/fw/ben/ben.c
index 6d6bcd3..a09b0fa 100644
--- a/tornado/fw/ben/ben.c
+++ b/tornado/fw/ben/ben.c
@@ -16,7 +16,7 @@
 #include <sys/mman.h>
 
 #include "../mmc.h"
-#include "ben-io.h"
+#include "io.h"
 
 
 #define SOC_BASE	0x10000000
diff --git a/tornado/fw/ben/ben-io.h b/tornado/fw/ben/io.h
similarity index 94%
rename from tornado/fw/ben/ben-io.h
rename to tornado/fw/ben/io.h
index fee6b21..4bc46d6 100644
--- a/tornado/fw/ben/ben-io.h
+++ b/tornado/fw/ben/io.h
@@ -1,5 +1,5 @@
 /*
- * ben/ben-io.h - I/O helper macros (for cross-platform testing on the Ben)
+ * ben/io.h - I/O helper macros (for cross-platform testing on the Ben)
  *
  * Written 2012 by Werner Almesberger
  * Copyright 2012 Werner Almesberger
diff --git a/tornado/fw/mmc-hw.c b/tornado/fw/mmc-hw.c
index c9d25d1..63230d5 100644
--- a/tornado/fw/mmc-hw.c
+++ b/tornado/fw/mmc-hw.c
@@ -13,16 +13,7 @@
 
 #include <stdint.h>
 
-#ifdef AVR
-
 #include "io.h"
-
-#else /* AVR */
-
-#include "ben-io.h"
-
-#endif /* !AVR */
-
 #include "delay.h"
 #include "mmc-hw.h"