diff --git a/apps/bounce1/Makefile.test b/apps/bounce1/Makefile.test
index 7b9fdac..30049d4 100644
--- a/apps/bounce1/Makefile.test
+++ b/apps/bounce1/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for bounce1
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../utils
 
 DEL = rm
 
diff --git a/apps/bounce2/Makefile.test b/apps/bounce2/Makefile.test
index 5fa1ffd..4d8511e 100644
--- a/apps/bounce2/Makefile.test
+++ b/apps/bounce2/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for bounce2
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../utils
 
 DEL = rm
 
diff --git a/apps/bounce3/Makefile.test b/apps/bounce3/Makefile.test
index 87e1b9d..ba1e355 100644
--- a/apps/bounce3/Makefile.test
+++ b/apps/bounce3/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for bounce3
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../utils
 
 DEL = rm
 
diff --git a/apps/bounce4/Makefile.test b/apps/bounce4/Makefile.test
index 72b5a53..44d29a8 100644
--- a/apps/bounce4/Makefile.test
+++ b/apps/bounce4/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for bounce4
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../utils
 
 DEL = rm
 
diff --git a/apps/bounce5/Makefile.test b/apps/bounce5/Makefile.test
index 0a41700..ac33ea2 100644
--- a/apps/bounce5/Makefile.test
+++ b/apps/bounce5/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for bounce5
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../utils
 
 DEL = rm
 
diff --git a/apps/chooser/Makefile.test b/apps/chooser/Makefile.test
index f5ffdf2..95e4a9f 100644
--- a/apps/chooser/Makefile.test
+++ b/apps/chooser/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for chooser
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/demo1/Makefile.test b/apps/demo1/Makefile.test
index 55bb942..0765234 100644
--- a/apps/demo1/Makefile.test
+++ b/apps/demo1/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for demo1
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test
 
 DEL = rm
 
diff --git a/apps/demo2/Makefile.test b/apps/demo2/Makefile.test
index 169820f..3555cf3 100644
--- a/apps/demo2/Makefile.test
+++ b/apps/demo2/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for demo2
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers
 
 DEL = rm
 
diff --git a/apps/fonttest1/Makefile.test b/apps/fonttest1/Makefile.test
index 2a35555..0bf5974 100644
--- a/apps/fonttest1/Makefile.test
+++ b/apps/fonttest1/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for fonttest1
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/hello1/Makefile.test b/apps/hello1/Makefile.test
index 3d2ba47..c8f226e 100644
--- a/apps/hello1/Makefile.test
+++ b/apps/hello1/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for hello1
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../drivers/test -I../../drivers -I../../utils
 
 DEL = rm
 
diff --git a/apps/hello2/Makefile.test b/apps/hello2/Makefile.test
index f561df2..fb531ec 100644
--- a/apps/hello2/Makefile.test
+++ b/apps/hello2/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for hello2
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/hello3/Makefile.test b/apps/hello3/Makefile.test
index d5ea08a..c28db77 100644
--- a/apps/hello3/Makefile.test
+++ b/apps/hello3/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for hello3
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/hello4/Makefile.test b/apps/hello4/Makefile.test
index f7af7ea..5e3c641 100644
--- a/apps/hello4/Makefile.test
+++ b/apps/hello4/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for hello4
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/ir_grab1/Makefile.test b/apps/ir_grab1/Makefile.test
index 01b3771..e15ff41 100644
--- a/apps/ir_grab1/Makefile.test
+++ b/apps/ir_grab1/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for ir_grab1
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/ir_grab2/Makefile.test b/apps/ir_grab2/Makefile.test
index fddee74..046aa37 100644
--- a/apps/ir_grab2/Makefile.test
+++ b/apps/ir_grab2/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for ir_grab2
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/ir_grab3/Makefile.test b/apps/ir_grab3/Makefile.test
index 71769c1..0eaccf0 100644
--- a/apps/ir_grab3/Makefile.test
+++ b/apps/ir_grab3/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for ir_grab3
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/ir_serial_test1/Makefile.test b/apps/ir_serial_test1/Makefile.test
index 799c87d..6a60e32 100644
--- a/apps/ir_serial_test1/Makefile.test
+++ b/apps/ir_serial_test1/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for ir_serial_test1
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/ir_serial_test2/Makefile.test b/apps/ir_serial_test2/Makefile.test
index a1e6e1c..b1168f0 100644
--- a/apps/ir_serial_test2/Makefile.test
+++ b/apps/ir_serial_test2/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for ir_serial_test2
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/ir_serial_test3/Makefile.test b/apps/ir_serial_test3/Makefile.test
index 6dadb2d..08f5906 100644
--- a/apps/ir_serial_test3/Makefile.test
+++ b/apps/ir_serial_test3/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for ir_serial_test3
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/ir_uart_test1/Makefile.test b/apps/ir_uart_test1/Makefile.test
index 57f17f8..bf195bd 100644
--- a/apps/ir_uart_test1/Makefile.test
+++ b/apps/ir_uart_test1/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for ir_uart_test1
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/ir_uart_test2/Makefile.test b/apps/ir_uart_test2/Makefile.test
index ad7d751..ba4285c 100644
--- a/apps/ir_uart_test2/Makefile.test
+++ b/apps/ir_uart_test2/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for ir_uart_test2
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/led1/Makefile.test b/apps/led1/Makefile.test
index 275fb3b..bcfd147 100644
--- a/apps/led1/Makefile.test
+++ b/apps/led1/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for led1
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../utils
 
 DEL = rm
 
diff --git a/apps/led2/Makefile.test b/apps/led2/Makefile.test
index 5e8a5a5..d07eb07 100644
--- a/apps/led2/Makefile.test
+++ b/apps/led2/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for led2
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../utils
 
 DEL = rm
 
diff --git a/apps/led3/Makefile.test b/apps/led3/Makefile.test
index 693df87..a889c16 100644
--- a/apps/led3/Makefile.test
+++ b/apps/led3/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for led3
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../utils
 
 DEL = rm
 
diff --git a/apps/led4/Makefile.test b/apps/led4/Makefile.test
index f38c468..be0f906 100644
--- a/apps/led4/Makefile.test
+++ b/apps/led4/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for led4
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../utils
 
 DEL = rm
 
diff --git a/apps/led5/Makefile.test b/apps/led5/Makefile.test
index ab124eb..3e4ac0b 100644
--- a/apps/led5/Makefile.test
+++ b/apps/led5/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for led5
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers
 
 DEL = rm
 
diff --git a/apps/pio1/Makefile.test b/apps/pio1/Makefile.test
index 056cbcf..18f68b3 100644
--- a/apps/pio1/Makefile.test
+++ b/apps/pio1/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for pio1
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test
 
 DEL = rm
 
diff --git a/apps/pio2/Makefile.test b/apps/pio2/Makefile.test
index 47655f4..2def846 100644
--- a/apps/pio2/Makefile.test
+++ b/apps/pio2/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for pio2
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test
 
 DEL = rm
 
diff --git a/apps/pio3/Makefile.test b/apps/pio3/Makefile.test
index eeb8d40..49848db 100644
--- a/apps/pio3/Makefile.test
+++ b/apps/pio3/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for pio3
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test
 
 DEL = rm
 
diff --git a/apps/scribble1/Makefile.test b/apps/scribble1/Makefile.test
index ae37e1c..2ee73b6 100644
--- a/apps/scribble1/Makefile.test
+++ b/apps/scribble1/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for scribble1
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/snake1/Makefile.test b/apps/snake1/Makefile.test
index c26cc20..deab8fb 100644
--- a/apps/snake1/Makefile.test
+++ b/apps/snake1/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for snake1
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/space10/Makefile.test b/apps/space10/Makefile.test
index ae74796..e049e0d 100644
--- a/apps/space10/Makefile.test
+++ b/apps/space10/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for space10
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/space11/Makefile.test b/apps/space11/Makefile.test
index a789349..f0d67e1 100644
--- a/apps/space11/Makefile.test
+++ b/apps/space11/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for space11
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/space12/Makefile b/apps/space12/Makefile
index f2c1c64..948280e 100644
--- a/apps/space12/Makefile
+++ b/apps/space12/Makefile
@@ -49,7 +49,7 @@ ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/syste
 navswitch.o: ../../drivers/navswitch.c ../../drivers/avr/delay.h ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/navswitch.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-mmelody.o: ../../extra/mmelody.c ../../drivers/avr/system.h ../../extra/mmelody.h ../../extra/ticker.h
+mmelody.o: ../../extra/mmelody.c ../../drivers/avr/system.h ../../extra/mmelody.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 squeaker.o: ../../extra/squeaker.c ../../drivers/avr/system.h ../../extra/squeaker.h ../../extra/ticker.h
diff --git a/apps/space12/Makefile.test b/apps/space12/Makefile.test
index d1172cb..12f8f5f 100644
--- a/apps/space12/Makefile.test
+++ b/apps/space12/Makefile.test
@@ -50,7 +50,7 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr
 timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-mmelody-test.o: ../../extra/mmelody.c ../../drivers/test/system.h ../../extra/mmelody.h ../../extra/ticker.h
+mmelody-test.o: ../../extra/mmelody.c ../../drivers/test/system.h ../../extra/mmelody.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 squeaker-test.o: ../../extra/squeaker.c ../../drivers/test/system.h ../../extra/squeaker.h ../../extra/ticker.h
diff --git a/apps/space9/Makefile.test b/apps/space9/Makefile.test
index 34e3294..e4bf6d4 100644
--- a/apps/space9/Makefile.test
+++ b/apps/space9/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for space9
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/spacey_remote1/Makefile.test b/apps/spacey_remote1/Makefile.test
index a119a26..c4da818 100644
--- a/apps/spacey_remote1/Makefile.test
+++ b/apps/spacey_remote1/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for spacey_remote1
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/squeak1/Makefile b/apps/squeak1/Makefile
index 7a69c14..46ac251 100644
--- a/apps/squeak1/Makefile
+++ b/apps/squeak1/Makefile
@@ -31,7 +31,7 @@ timer.o: ../../drivers/avr/timer.c ../../drivers/avr/system.h ../../drivers/avr/
 led.o: ../../drivers/led.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/led.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-mmelody.o: ../../extra/mmelody.c ../../drivers/avr/system.h ../../extra/mmelody.h ../../extra/ticker.h
+mmelody.o: ../../extra/mmelody.c ../../drivers/avr/system.h ../../extra/mmelody.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 squeaker.o: ../../extra/squeaker.c ../../drivers/avr/system.h ../../extra/squeaker.h ../../extra/ticker.h
diff --git a/apps/squeak1/Makefile.test b/apps/squeak1/Makefile.test
index a38c7c4..125a10e 100644
--- a/apps/squeak1/Makefile.test
+++ b/apps/squeak1/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for squeak1
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../extra -I../../utils
 
 DEL = rm
 
@@ -32,7 +32,7 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr
 timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-mmelody-test.o: ../../extra/mmelody.c ../../drivers/test/system.h ../../extra/mmelody.h ../../extra/ticker.h
+mmelody-test.o: ../../extra/mmelody.c ../../drivers/test/system.h ../../extra/mmelody.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 squeaker-test.o: ../../extra/squeaker.c ../../drivers/test/system.h ../../extra/squeaker.h ../../extra/ticker.h
diff --git a/apps/squeak2/Makefile b/apps/squeak2/Makefile
index 4f0192a..b09976d 100644
--- a/apps/squeak2/Makefile
+++ b/apps/squeak2/Makefile
@@ -5,7 +5,7 @@
 
 # Definitions.
 CC = avr-gcc
-CFLAGS = -mmcu=atmega32u2 -Os -finline -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../extra -I../../drivers -I../../utils
+CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/avr -I../../extra -I../../drivers -I../../utils
 OBJCOPY = avr-objcopy
 SIZE = avr-size
 DEL = rm
@@ -34,7 +34,7 @@ button.o: ../../drivers/button.c ../../drivers/avr/pio.h ../../drivers/avr/syste
 led.o: ../../drivers/led.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/led.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-mmelody.o: ../../extra/mmelody.c ../../drivers/avr/system.h ../../extra/mmelody.h ../../extra/ticker.h
+mmelody.o: ../../extra/mmelody.c ../../drivers/avr/system.h ../../extra/mmelody.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 squeaker.o: ../../extra/squeaker.c ../../drivers/avr/system.h ../../extra/squeaker.h ../../extra/ticker.h
diff --git a/apps/squeak2/Makefile.test b/apps/squeak2/Makefile.test
index 9b72bb2..ba27793 100644
--- a/apps/squeak2/Makefile.test
+++ b/apps/squeak2/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for squeak2
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../extra -I../../utils
 
 DEL = rm
 
@@ -14,7 +14,10 @@ all: squeak2
 
 
 # Compile: create object files from C source files.
-squeak2-test.o: squeak2.c ../../drivers/led.h ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h ../../drivers/test/timer.h ../../extra/mmelody.h ../../extra/squeaker.h ../../extra/ticker.h ../../extra/tweeter.h ../../utils/task.h
+squeak2-test.o: squeak2.c ../../drivers/button.h ../../drivers/led.h ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h ../../drivers/test/timer.h ../../extra/mmelody.h ../../extra/squeaker.h ../../extra/ticker.h ../../extra/tweeter.h ../../utils/task.h
+	$(CC) -c $(CFLAGS) $< -o $@
+
+button-test.o: ../../drivers/button.c ../../drivers/button.h ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 led-test.o: ../../drivers/led.c ../../drivers/led.h ../../drivers/test/avrtest.h ../../drivers/test/pio.h ../../drivers/test/system.h
@@ -32,7 +35,7 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr
 timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-mmelody-test.o: ../../extra/mmelody.c ../../drivers/test/system.h ../../extra/mmelody.h ../../extra/ticker.h
+mmelody-test.o: ../../extra/mmelody.c ../../drivers/test/system.h ../../extra/mmelody.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 squeaker-test.o: ../../extra/squeaker.c ../../drivers/test/system.h ../../extra/squeaker.h ../../extra/ticker.h
@@ -51,14 +54,14 @@ task-test.o: ../../utils/task.c ../../drivers/test/system.h ../../drivers/test/t
 
 
 # Link: create executable file from object files.
-squeak2: squeak2-test.o led-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o mmelody-test.o squeaker-test.o ticker-test.o tweeter-test.o task-test.o
+squeak2: squeak2-test.o button-test.o led-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o mmelody-test.o squeaker-test.o ticker-test.o tweeter-test.o task-test.o
 	$(CC) $(CFLAGS) $^ -o $@ -lrt
 
 
 # Clean: delete derived files.
 .PHONY: clean
 clean: 
-	-$(DEL) squeak2 squeak2-test.o led-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o mmelody-test.o squeaker-test.o ticker-test.o tweeter-test.o task-test.o
+	-$(DEL) squeak2 squeak2-test.o button-test.o led-test.o mgetkey-test.o pio-test.o system-test.o timer-test.o mmelody-test.o squeaker-test.o ticker-test.o tweeter-test.o task-test.o
 
 
 
diff --git a/apps/squeak3/doc/Makefile b/apps/squeak3/doc/Makefile
index c0396aa..f6c8890 100644
--- a/apps/squeak3/doc/Makefile
+++ b/apps/squeak3/doc/Makefile
@@ -1,7 +1,7 @@
 # File:   Makefile
 # Author: M. P. Hayes, UCECE
 # Date:   11 Sep 2010
-# Descr:  Makefile for squeak2 docs
+# Descr:  Makefile for squeak3 docs
 
 DEL = rm
 
diff --git a/apps/squeak4/Makefile b/apps/squeak4/Makefile
index 3d7074c..5b06753 100644
--- a/apps/squeak4/Makefile
+++ b/apps/squeak4/Makefile
@@ -5,7 +5,7 @@
 
 # Definitions.
 CC = avr-gcc
-CFLAGS = -mmcu=atmega32u2 -Os -finline -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../extra -I../../drivers/avr -I../../fonts -I../../utils
+CFLAGS = -mmcu=atmega32u2 -Os -Wall -Wstrict-prototypes -Wextra -g -I../../drivers -I../../extra -I../../drivers/avr -I../../fonts -I../../utils
 OBJCOPY = avr-objcopy
 SIZE = avr-size
 DEL = rm
@@ -40,7 +40,7 @@ led.o: ../../drivers/led.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ..
 ledmat.o: ../../drivers/ledmat.c ../../drivers/avr/pio.h ../../drivers/avr/system.h ../../drivers/ledmat.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-mmelody.o: ../../extra/mmelody.c ../../drivers/avr/system.h ../../extra/mmelody.h ../../extra/ticker.h
+mmelody.o: ../../extra/mmelody.c ../../drivers/avr/system.h ../../extra/mmelody.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 squeaker.o: ../../extra/squeaker.c ../../drivers/avr/system.h ../../extra/squeaker.h ../../extra/ticker.h
diff --git a/apps/squeak4/Makefile.test b/apps/squeak4/Makefile.test
index b2b2bdf..5dbf72c 100644
--- a/apps/squeak4/Makefile.test
+++ b/apps/squeak4/Makefile.test
@@ -41,7 +41,7 @@ system-test.o: ../../drivers/test/system.c ../../drivers/test/avrtest.h ../../dr
 timer-test.o: ../../drivers/test/timer.c ../../drivers/test/system.h ../../drivers/test/timer.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
-mmelody-test.o: ../../extra/mmelody.c ../../drivers/test/system.h ../../extra/mmelody.h ../../extra/ticker.h
+mmelody-test.o: ../../extra/mmelody.c ../../drivers/test/system.h ../../extra/mmelody.h
 	$(CC) -c $(CFLAGS) $< -o $@
 
 squeaker-test.o: ../../extra/squeaker.c ../../drivers/test/system.h ../../extra/squeaker.h ../../extra/ticker.h
diff --git a/apps/squeak4/doc/Makefile b/apps/squeak4/doc/Makefile
index c0396aa..69ab29d 100644
--- a/apps/squeak4/doc/Makefile
+++ b/apps/squeak4/doc/Makefile
@@ -1,7 +1,7 @@
 # File:   Makefile
 # Author: M. P. Hayes, UCECE
 # Date:   11 Sep 2010
-# Descr:  Makefile for squeak2 docs
+# Descr:  Makefile for squeak4 docs
 
 DEL = rm
 
diff --git a/apps/steer1/Makefile.test b/apps/steer1/Makefile.test
index b0c46b4..7018fb9 100644
--- a/apps/steer1/Makefile.test
+++ b/apps/steer1/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for steer1
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/task1/Makefile.test b/apps/task1/Makefile.test
index def1d6e..cbbe334 100644
--- a/apps/task1/Makefile.test
+++ b/apps/task1/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for task1
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../utils
 
 DEL = rm
 
diff --git a/apps/task2/Makefile.test b/apps/task2/Makefile.test
index 94b4028..18a7169 100644
--- a/apps/task2/Makefile.test
+++ b/apps/task2/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for task2
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/tdmdemo1/Makefile.test b/apps/tdmdemo1/Makefile.test
index 3bc6fda..2b027ac 100644
--- a/apps/tdmdemo1/Makefile.test
+++ b/apps/tdmdemo1/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for tdmdemo1
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../utils
 
 DEL = rm
 
diff --git a/apps/tdmdemo2/Makefile.test b/apps/tdmdemo2/Makefile.test
index 515597f..66c4c62 100644
--- a/apps/tdmdemo2/Makefile.test
+++ b/apps/tdmdemo2/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for tdmdemo2
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../utils
 
 DEL = rm
 
diff --git a/apps/updown1/Makefile.test b/apps/updown1/Makefile.test
index eb2b7c2..94615ad 100644
--- a/apps/updown1/Makefile.test
+++ b/apps/updown1/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for updown1
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/apps/updown2/Makefile.test b/apps/updown2/Makefile.test
index 3b07986..20a1708 100644
--- a/apps/updown2/Makefile.test
+++ b/apps/updown2/Makefile.test
@@ -4,7 +4,7 @@
 # Descr:  Makefile for updown2
 
 CC = gcc
-CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I. -I../../utils -I../../drivers -I../../drivers/test -I../../extra
+CFLAGS = -Wall -Wstrict-prototypes -Wextra -g -I../../drivers/test -I../../drivers -I../../fonts -I../../utils
 
 DEL = rm
 
diff --git a/drivers/avr/pio.c b/drivers/avr/pio.c
index d83f71f..c183d8f 100644
--- a/drivers/avr/pio.c
+++ b/drivers/avr/pio.c
@@ -7,7 +7,7 @@
 #include "system.h"
 #include "pio.h"
 
-#ifdef __NO_INLINE__
+#ifdef DEBUG
 
 /** Configure pio.
     @param pio PIO to configure
diff --git a/drivers/avr/pio.h b/drivers/avr/pio.h
index 45579ab..87eb3d5 100644
--- a/drivers/avr/pio.h
+++ b/drivers/avr/pio.h
@@ -130,7 +130,7 @@ typedef enum pio_config_enum
 #define PIO_DATA_(pio) (*PIO_PORT_ (pio))
 
 
-#ifdef __NO_INLINE__
+#ifdef DEBUG
 /** Configure pio.
     @param pio PIO to configure
     @param config PIO configuration type
diff --git a/etc/Makefile b/etc/Makefile
index 1c22d1b..e8f59c5 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -50,7 +50,7 @@ docs: $(DOCMAKEFILES)
 	(cd $(dir $@);	../../etc/makemake.py --cc="gcc" --cflags="" --relpath --objext=-test.o --template ../../etc/Makefile.test.template . . ../../utils ../../drivers ../../drivers/test ../../extra > Makefile.test)
 
 ../%/Makefile: Makefile.template Makefile makemake.py
-	(cd $(dir $@);	../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2 -finline" --relpath --template ../../etc/Makefile.template . . ../../utils ../../fonts ../../drivers ../../drivers/avr ../../extra > Makefile)
+	(cd $(dir $@);	../../etc/makemake.py --cc="avr-gcc" --cflags="-Os -mmcu=atmega32u2" --relpath --template ../../etc/Makefile.template . . ../../utils ../../fonts ../../drivers ../../drivers/avr ../../extra > Makefile)
 
 
 
diff --git a/etc/makemake.py b/etc/makemake.py
index fbcb567..dc82b2a 100755
--- a/etc/makemake.py
+++ b/etc/makemake.py
@@ -260,7 +260,7 @@ def maincfilename_find (dirname):
 
 def functions_find (filepath, functiondeps, functions, options):
 
-    command = options.compile + ' -c ' + filepath + ' -fdump-tree-cfg-raw -fno-inline > /dev/null'
+    command = options.compile + ' -c ' + filepath + ' -fdump-tree-cfg-raw -Ddebug > /dev/null'
     if options.debug:
         print >> sys.stderr, command
     os.system (command)