diff --git a/src/comm/applemidi.c b/src/comm/applemidi.c
index acc28f9..346a5a6 100644
--- a/src/comm/applemidi.c
+++ b/src/comm/applemidi.c
@@ -1,6 +1,5 @@
 #include "applemidi.h"
 #include "rtpmidi.h"
-#include "string.h"
 #include "log.h"
 #include "comm_megawifi.h"
 #include "settings.h"
diff --git a/src/comm/applemidi.h b/src/comm/applemidi.h
index 51634d6..0bea240 100644
--- a/src/comm/applemidi.h
+++ b/src/comm/applemidi.h
@@ -1,6 +1,5 @@
 #pragma once
-#include "types.h"
-#include "ext/mw/megawifi.h"
+#include "genesis.h"
 
 #define ERR_BASE 100
 #define ERR_INVALID_APPLE_MIDI_SIGNATURE ERR_BASE;
diff --git a/src/comm/buffer.h b/src/comm/buffer.h
index d0de6a0..b752e41 100644
--- a/src/comm/buffer.h
+++ b/src/comm/buffer.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "genesis.h"
 
 #define BUFFER_SIZE 4096
 
diff --git a/src/comm/comm.c b/src/comm/comm.c
index 964932a..57c5473 100644
--- a/src/comm/comm.c
+++ b/src/comm/comm.c
@@ -4,9 +4,6 @@
 #include "comm_megawifi.h"
 #include "comm_serial.h"
 #include "comm_demo.h"
-#include "vdp.h"
-#include "vdp_bg.h"
-#include "string.h"
 #include "settings.h"
 
 static u16 idle = 0;
diff --git a/src/comm/comm.h b/src/comm/comm.h
index 272902f..4bea575 100644
--- a/src/comm/comm.h
+++ b/src/comm/comm.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "genesis.h"
 
 typedef enum CommMode { Discovery, Everdrive, EverdrivePro, Serial, MegaWiFi, Demo } CommMode;
 
diff --git a/src/comm/comm_demo.c b/src/comm/comm_demo.c
index b2142e9..3399ca6 100644
--- a/src/comm/comm_demo.c
+++ b/src/comm/comm_demo.c
@@ -1,6 +1,4 @@
 #include "comm_demo.h"
-#include "joy.h"
-#include "sys.h"
 #include "midi_fm.h"
 #include "log.h"
 #include "scheduler.h"
diff --git a/src/comm/comm_demo.h b/src/comm/comm_demo.h
index 453a4dc..915669a 100644
--- a/src/comm/comm_demo.h
+++ b/src/comm/comm_demo.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "genesis.h"
 
 void comm_demo_init(void);
 bool comm_demo_is_present(void);
diff --git a/src/comm/comm_everdrive.h b/src/comm/comm_everdrive.h
index 99bb4c1..194e3b2 100644
--- a/src/comm/comm_everdrive.h
+++ b/src/comm/comm_everdrive.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "genesis.h"
 
 void comm_everdrive_init(void);
 bool comm_everdrive_is_present(void);
diff --git a/src/comm/comm_everdrive_pro.h b/src/comm/comm_everdrive_pro.h
index a5afdfa..e29a609 100644
--- a/src/comm/comm_everdrive_pro.h
+++ b/src/comm/comm_everdrive_pro.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "genesis.h"
 
 void comm_everdrive_pro_init(void);
 bool comm_everdrive_pro_is_present(void);
diff --git a/src/comm/comm_megawifi.c b/src/comm/comm_megawifi.c
index 27c5765..c74d35a 100644
--- a/src/comm/comm_megawifi.c
+++ b/src/comm/comm_megawifi.c
@@ -1,15 +1,10 @@
 #include "comm_megawifi.h"
 #include "applemidi.h"
 #include "log.h"
-#include "ext/mw/megawifi.h"
-#include "ext/mw/lsd.h"
 #include "mw_uart.h"
-#include "string.h"
 #include "settings.h"
 #include "buffer.h"
-#include "memory.h"
 #include "ip_util.h"
-#include "task.h"
 #include "scheduler.h"
 
 #define UDP_CONTROL_PORT 5006
diff --git a/src/comm/comm_megawifi.h b/src/comm/comm_megawifi.h
index 31fd06c..8c05da2 100644
--- a/src/comm/comm_megawifi.h
+++ b/src/comm/comm_megawifi.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "genesis.h"
 
 void comm_megawifi_init(void);
 bool comm_megawifi_is_present(void);
diff --git a/src/comm/comm_serial.h b/src/comm/comm_serial.h
index fc23532..8eddc19 100644
--- a/src/comm/comm_serial.h
+++ b/src/comm/comm_serial.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "genesis.h"
 
 void comm_serial_init(void);
 bool comm_serial_is_present(void);
diff --git a/src/comm/everdrive_led.h b/src/comm/everdrive_led.h
index de599f7..6d50743 100644
--- a/src/comm/everdrive_led.h
+++ b/src/comm/everdrive_led.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "genesis.h"
 
 void everdrive_led_init(void);
 void everdrive_led_blink(void);
diff --git a/src/comm/ip_util.h b/src/comm/ip_util.h
index 72a7860..3dc0e3b 100644
--- a/src/comm/ip_util.h
+++ b/src/comm/ip_util.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "types.h"
+#include "genesis.h"
 
 uint16_t uint8_to_str(uint8_t num, char* str);
 int uint32_to_ip_str(uint32_t ip_u32, char* ip_str);
diff --git a/src/comm/mw_uart.h b/src/comm/mw_uart.h
index 45ae2c7..1b68ce3 100644
--- a/src/comm/mw_uart.h
+++ b/src/comm/mw_uart.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "types.h"
-#include "ext/mw/16c550.h"
+#include "genesis.h"
 
 bool mw_uart_is_present(void);
diff --git a/src/comm/rtpmidi.c b/src/comm/rtpmidi.c
index cb968e7..2cdcea2 100644
--- a/src/comm/rtpmidi.c
+++ b/src/comm/rtpmidi.c
@@ -1,4 +1,5 @@
 #include "rtpmidi.h"
+#include "applemidi.h"
 #include "comm_megawifi.h"
 #include "bits.h"
 
diff --git a/src/comm/rtpmidi.h b/src/comm/rtpmidi.h
index ed01f81..d4339bf 100644
--- a/src/comm/rtpmidi.h
+++ b/src/comm/rtpmidi.h
@@ -1,4 +1,4 @@
 #pragma once
-#include "applemidi.h"
+#include "genesis.h"
 
 enum mw_err rtpmidi_processRtpMidiPacket(char* buffer, u16 length, u16* lastSeqNum);
diff --git a/src/comm/serial.h b/src/comm/serial.h
index 327b204..e80e9d8 100644
--- a/src/comm/serial.h
+++ b/src/comm/serial.h
@@ -1,7 +1,5 @@
 #pragma once
-#include "types.h"
-#include "sys.h"
-#include "vdp.h"
+#include "genesis.h"
 
 #define PORT2_CTRL 0xA1000B
 #define PORT2_SCTRL 0xA10019