diff --git a/avr/devices/all/includes.asm b/avr/devices/all/includes.asm
index 37d6646..35219b4 100644
--- a/avr/devices/all/includes.asm
+++ b/avr/devices/all/includes.asm
@@ -68,25 +68,31 @@
 
 
 #ifdef MODULES_COMONUART0
-.include "modules/uart_hw/defs.asm"
-.include "modules/uart_hw/lowlevel.asm"
-.include "modules/uart_hw/m_lowlevel_uart.asm"
-.include "modules/uart_hw/comonuart0.asm"
+;.include "modules/uart_hw/defs.asm"
+;.include "modules/uart_hw/lowlevel.asm"
+;.include "modules/uart_hw/m_lowlevel_uart.asm"
+;.include "modules/uart_hw/comonuart0.asm"
+.include "modules/uart_hw2/defs.asm"
+.include "modules/uart_hw2/comonuart0.asm"
 #endif
 
 #ifdef MODULES_COMONUART1
+;.include "modules/uart_hw/defs.asm"
+;.include "modules/uart_hw/lowlevel.asm"
+;.include "modules/uart_hw/m_lowlevel_uart.asm"
+;.include "modules/uart_hw/comonuart1.asm"
 .include "modules/uart_hw2/defs.asm"
 .include "modules/uart_hw2/comonuart1.asm"
 #endif
 
 
 #ifdef MODULES_TTYONUART1
-#ifndef MODULES_COMONUART0
 .include "modules/uart_hw/defs.asm"
 .include "modules/uart_hw/lowlevel.asm"
 .include "modules/uart_hw/m_lowlevel_uart.asm"
-#endif
 .include "modules/uart_hw/ttyonuart1.asm"
+;.include "modules/uart_hw2/defs.asm"
+;.include "modules/uart_hw2/ttyonuart1.asm"
 #endif