diff --git a/avr/devices/n16/boot/boot.asm b/avr/devices/n16/boot/boot.asm
index f262502..74bd935 100644
--- a/avr/devices/n16/boot/boot.asm
+++ b/avr/devices/n16/boot/boot.asm
@@ -16,25 +16,16 @@
 .include "../defs.asm"
 .include "devices/all/defs.asm"
 
+.include "common/calls.asm"
+.include "common/utils_wait.asm"
+;.include "modules/com2/defs.asm"
+;.include "modules/comproto/defs.asm"
+
 
 
 ; ***************************************************************************
 ; defines
 
-; ---------------------------------------------------------------------------
-; generic
-
-.include "common/utils_wait.asm"
-.include "modules/com2/defs.asm"
-.include "modules/comproto/defs.asm"
-
-
-
-; ---------------------------------------------------------------------------
-; firmware settings
-
-
-
 ; ---------------------------------------------------------------------------
 ; LED
 
diff --git a/avr/devices/n16/main/main.asm b/avr/devices/n16/main/main.asm
index 8353e0c..353b3b1 100644
--- a/avr/devices/n16/main/main.asm
+++ b/avr/devices/n16/main/main.asm
@@ -34,6 +34,8 @@
 .include "../defs.asm"
 
 .include "devices/all/defs.asm"
+
+.include "common/calls.asm"
 .include "common/utils_wait.asm"
 
 
diff --git a/avr/devices/n20/boot.asm b/avr/devices/n20/boot.asm
index 00c7184..919d3d2 100644
--- a/avr/devices/n20/boot.asm
+++ b/avr/devices/n20/boot.asm
@@ -16,26 +16,14 @@
 .include "./defs.asm"
 .include "devices/all/defs.asm"
 
+.include "common/calls.asm"
+.include "common/utils_wait.asm"
+
 
 
 ; ***************************************************************************
 ; defines
 
-; ---------------------------------------------------------------------------
-; generic
-
-.include "common/utils_wait.asm"
-.include "modules/com2/defs.asm"
-.include "modules/comproto/defs.asm"
-
-
-
-; ---------------------------------------------------------------------------
-; firmware settings
-
-
-
-
 ; ---------------------------------------------------------------------------
 ; LED
 
diff --git a/avr/devices/n20/main.asm b/avr/devices/n20/main.asm
index a40ac2b..1f720e8 100644
--- a/avr/devices/n20/main.asm
+++ b/avr/devices/n20/main.asm
@@ -34,6 +34,7 @@
 .include "./defs.asm"
 .include "devices/all/defs.asm"
 
+.include "common/calls.asm"
 .include "common/utils_wait.asm"
 
 
diff --git a/avr/devices/n21/boot/boot.asm b/avr/devices/n21/boot/boot.asm
index 791ecdf..c05a918 100644
--- a/avr/devices/n21/boot/boot.asm
+++ b/avr/devices/n21/boot/boot.asm
@@ -16,24 +16,14 @@
 .include "../defs.asm"
 .include "devices/all/defs.asm"
 
+.include "common/calls.asm"
+.include "common/utils_wait.asm"
+
 
 
 ; ***************************************************************************
 ; defines
 
-; ---------------------------------------------------------------------------
-; generic
-
-.include "common/utils_wait.asm"
-.include "modules/com2/defs.asm"
-.include "modules/comproto/defs.asm"
-
-
-
-; ---------------------------------------------------------------------------
-; firmware settings
-
-
 
 ; ---------------------------------------------------------------------------
 ; LED
diff --git a/avr/devices/n21/main/main.asm b/avr/devices/n21/main/main.asm
index 7ffbd61..15e3068 100644
--- a/avr/devices/n21/main/main.asm
+++ b/avr/devices/n21/main/main.asm
@@ -35,6 +35,7 @@
 .include "./data.asm"
 
 .include "devices/all/defs.asm"
+.include "common/calls.asm"
 .include "common/utils_wait.asm"
 
 
diff --git a/avr/devices/n22/boot/boot.asm b/avr/devices/n22/boot/boot.asm
index 646b42b..2acc025 100644
--- a/avr/devices/n22/boot/boot.asm
+++ b/avr/devices/n22/boot/boot.asm
@@ -18,22 +18,15 @@
 .include "../defs.asm"
 .include "devices/all/defs.asm"
 
-
-
-; ***************************************************************************
-; defines
-
-; ---------------------------------------------------------------------------
-; generic
-
+.include "common/calls.asm"
 .include "common/utils_wait.asm"
 .include "modules/com2/defs.asm"
 .include "modules/comproto/defs.asm"
 
 
-; ---------------------------------------------------------------------------
-; firmware settings
 
+; ***************************************************************************
+; defines
 
 
 ; ---------------------------------------------------------------------------
diff --git a/avr/devices/n22/main/main.asm b/avr/devices/n22/main/main.asm
index 891587c..40d0b99 100644
--- a/avr/devices/n22/main/main.asm
+++ b/avr/devices/n22/main/main.asm
@@ -27,6 +27,8 @@
 ;.include "./data.asm"
 
 .include "devices/all/defs.asm"
+
+.include "common/calls.asm"
 .include "common/utils_wait.asm"
 
 
diff --git a/avr/devices/n23/boot/boot.asm b/avr/devices/n23/boot/boot.asm
index 23c4f46..39bb493 100644
--- a/avr/devices/n23/boot/boot.asm
+++ b/avr/devices/n23/boot/boot.asm
@@ -16,6 +16,9 @@
 .include "../defs.asm"
 .include "devices/all/defs.asm"
 
+.include "common/calls.asm"
+.include "common/utils_wait.asm"
+
 
 #define COM_ACCEPT_ALL_DEST
 
@@ -24,18 +27,6 @@
 ; ***************************************************************************
 ; defines
 
-; ---------------------------------------------------------------------------
-; generic
-
-.include "common/utils_wait.asm"
-
-
-
-; ---------------------------------------------------------------------------
-; firmware settings
-
-
-
 ; ---------------------------------------------------------------------------
 ; LED
 
diff --git a/avr/devices/n23/main/main.asm b/avr/devices/n23/main/main.asm
index 66f10ca..f2f9b29 100644
--- a/avr/devices/n23/main/main.asm
+++ b/avr/devices/n23/main/main.asm
@@ -35,6 +35,7 @@
 .include "./data.asm"
 
 .include "devices/all/defs.asm"
+.include "common/calls.asm"
 .include "common/utils_wait.asm"
 
 
diff --git a/avr/devices/n24/boot/boot.asm b/avr/devices/n24/boot/boot.asm
index ba7f069..767f207 100644
--- a/avr/devices/n24/boot/boot.asm
+++ b/avr/devices/n24/boot/boot.asm
@@ -24,6 +24,7 @@
 
 .include "version.asm"
 .include "../defs.asm"
+
 .include "common/calls.asm"
 .include "devices/all/defs.asm"
 
diff --git a/avr/devices/t03/boot/boot.asm b/avr/devices/t03/boot/boot.asm
index 2e59e88..e9222f8 100644
--- a/avr/devices/t03/boot/boot.asm
+++ b/avr/devices/t03/boot/boot.asm
@@ -13,28 +13,18 @@
 .include "include/tn841def.inc" ; Define device ATtiny841
 .list
 
+.include "version.asm"
 .include "../defs.asm"
-.include "defs_all.asm"
+.include "devices/all/defs.asm"
+
+.include "common/calls.asm"
+.include "common/utils_wait.asm"
 
 
 
 ; ***************************************************************************
 ; defines
 
-; ---------------------------------------------------------------------------
-; generic
-
-.include "common/utils_wait.asm"
-
-
-
-; ---------------------------------------------------------------------------
-; firmware settings
-
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
 
 ;#define COM_ACCEPT_ALL_DEST 1
 
diff --git a/avr/devices/t03/main/main.asm b/avr/devices/t03/main/main.asm
index 14b708e..6dcb305 100644
--- a/avr/devices/t03/main/main.asm
+++ b/avr/devices/t03/main/main.asm
@@ -34,6 +34,8 @@
 ;.include "defs_all.asm"
 
 .include "devices/all/defs.asm"
+
+.include "common/calls.asm"
 .include "common/utils_wait.asm"
 .include "common/utils_io.asm"