diff --git a/app/bcc1/alarm1/a.cc b/app/bcc1/alarm1/a.cc
index 75e102f8fae9e82dca4e3bf3c41a4040a80ddc9e..daf8c961bd5acc6ac5623e865d29849e7caec64c 100644
--- a/app/bcc1/alarm1/a.cc
+++ b/app/bcc1/alarm1/a.cc
@@ -25,7 +25,7 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/alarm1/b.cc b/app/bcc1/alarm1/b.cc
index 66b893862aab4da98cbba051b03f056cfbd52023..9975ca0edf67c4ece19d1bff89c1fdc9543cb62f 100644
--- a/app/bcc1/alarm1/b.cc
+++ b/app/bcc1/alarm1/b.cc
@@ -27,7 +27,7 @@ TASK(H3) {
 }
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/alarm1/c.cc b/app/bcc1/alarm1/c.cc
index 3785af8c7ea01de1c19422f760aa28b0eb0cfa81..a3256533993f2599e1a35f9451148926644b8bca 100644
--- a/app/bcc1/alarm1/c.cc
+++ b/app/bcc1/alarm1/c.cc
@@ -25,7 +25,7 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/alarm1/d.cc b/app/bcc1/alarm1/d.cc
index 5720a1489ed7e31af8a448b6db2c43eb9c7c2259..6ddfed18e597fc2bb27a8e7063928fab6e3deecc 100644
--- a/app/bcc1/alarm1/d.cc
+++ b/app/bcc1/alarm1/d.cc
@@ -27,7 +27,7 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/alarm1/e.cc b/app/bcc1/alarm1/e.cc
index 400de092718747a2ddead21c08403c3a75cd85d4..40016c44623d2381b86eef526423496de0a98c93 100644
--- a/app/bcc1/alarm1/e.cc
+++ b/app/bcc1/alarm1/e.cc
@@ -39,7 +39,7 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/alarm1/f.cc b/app/bcc1/alarm1/f.cc
index f7f6bdde9e09dd7639b6812926f89877aec3da1f..c2baa16642017a88b49dee006afbe967a89b18ef 100644
--- a/app/bcc1/alarm1/f.cc
+++ b/app/bcc1/alarm1/f.cc
@@ -36,7 +36,7 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/alarm3/a.cc b/app/bcc1/alarm3/a.cc
index 2041e2824594b2ca69d4decb966c79599fe1e22b..bc41973e263f7df3af2e62cf8ebff30875da9e5b 100644
--- a/app/bcc1/alarm3/a.cc
+++ b/app/bcc1/alarm3/a.cc
@@ -53,7 +53,7 @@ TASK(H5) {
 }
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
     test_trace_assert("5[3]{}3x");
     test_finish();
diff --git a/app/bcc1/alarm3/b.cc b/app/bcc1/alarm3/b.cc
index f32ed8bf152fd4a4350f15e7ce185c984528ea4f..7eb26c6d215d7dd441fce30ed79ed49dbfb798cb 100644
--- a/app/bcc1/alarm3/b.cc
+++ b/app/bcc1/alarm3/b.cc
@@ -60,7 +60,7 @@ TASK(H5) {
 }
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
     test_trace_assert("5{<>}3x");
     test_finish();
diff --git a/app/bcc1/alarm3/c.cc b/app/bcc1/alarm3/c.cc
index d94edd3b3a93b91cab0d7f649cb7b814806ca0ec..02e371df964d937a8d58d7efb00a08ba174968f6 100644
--- a/app/bcc1/alarm3/c.cc
+++ b/app/bcc1/alarm3/c.cc
@@ -64,7 +64,7 @@ TASK(H5) {
 }
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
     test_trace_assert("5{<><><>}3x");
     test_finish();
diff --git a/app/bcc1/alarm3/d.cc b/app/bcc1/alarm3/d.cc
index ec2229af25ccef822a5c8a82f9d6244670445d0f..2c4fae6728b31e9ad7b2710ef2182de618893290 100644
--- a/app/bcc1/alarm3/d.cc
+++ b/app/bcc1/alarm3/d.cc
@@ -60,7 +60,7 @@ TASK(H5) {
 }
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
     test_trace_assert("5{<>}3x");
     test_finish();
diff --git a/app/bcc1/alarm3/e.cc b/app/bcc1/alarm3/e.cc
index 22733a07bc45010a6b3200527f174a51e2728476..6650bf7a8fc649fa9ed62b86d613dc750a265525 100644
--- a/app/bcc1/alarm3/e.cc
+++ b/app/bcc1/alarm3/e.cc
@@ -59,7 +59,7 @@ TASK(H5) {
 }
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
     test_trace_assert("5{+}3x");
     test_finish();
diff --git a/app/bcc1/complex1/a.cc b/app/bcc1/complex1/a.cc
index 72173dee1dab8be4a690a6fd91e41663601b33c4..50704d4b842813b57a6e995f829cbf1dd98eafe7 100644
--- a/app/bcc1/complex1/a.cc
+++ b/app/bcc1/complex1/a.cc
@@ -46,7 +46,7 @@ ISR2(ISR1) {
 
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	cycle_count++;
 
diff --git a/app/bcc1/complex1/b.cc b/app/bcc1/complex1/b.cc
index 101551a6a8406f172668b4aa194799e92e6d0afd..07418b496603d6a66854bc5b9895c988d6f8bb56 100644
--- a/app/bcc1/complex1/b.cc
+++ b/app/bcc1/complex1/b.cc
@@ -43,7 +43,7 @@ ISR2(ISR1) {
 	test_trace('}');
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	cycle_count++;
 
diff --git a/app/bcc1/complex1/c.cc b/app/bcc1/complex1/c.cc
index 8e5a3df7c0980721744e5da51b47e5e33cdb4978..b5f3d385d697f22efc5a1047e3275dfbd2e40b9a 100644
--- a/app/bcc1/complex1/c.cc
+++ b/app/bcc1/complex1/c.cc
@@ -46,7 +46,7 @@ ISR2(ISR1) {
 	test_trace('}');
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	cycle_count++;
 
diff --git a/app/bcc1/complex1/d.cc b/app/bcc1/complex1/d.cc
index 44505b8210f7281d2c910e2ea51c552db62c6bb8..fb0edd9ab92bd01cd7145b70fa7b103ba1df2573 100644
--- a/app/bcc1/complex1/d.cc
+++ b/app/bcc1/complex1/d.cc
@@ -52,7 +52,7 @@ ALARMCALLBACK(A1) {
 	test_trace('>');
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	cycle_count++;
 
diff --git a/app/bcc1/complex2/a.cc b/app/bcc1/complex2/a.cc
index b05b2cc9eb0d32f57da973a9bb53b52a72758575..1e9dad09978032c00dcee094de43d1d0c6fd2cd2 100644
--- a/app/bcc1/complex2/a.cc
+++ b/app/bcc1/complex2/a.cc
@@ -55,7 +55,7 @@ ISR2(ISR1) {
 	test_trace(':');
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("53.:-1");
 	test_finish();
diff --git a/app/bcc1/counter1/a.cc b/app/bcc1/counter1/a.cc
index 9cca2e3b4c7df966234c0630e352ffa2d5b67d66..e33195159a5f305db96c49765a194b6ec8172302 100644
--- a/app/bcc1/counter1/a.cc
+++ b/app/bcc1/counter1/a.cc
@@ -61,7 +61,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("1++2>>>23");
 	test_finish();
diff --git a/app/bcc1/depsvc/depsvc.cc b/app/bcc1/depsvc/depsvc.cc
index 27abdb24c541afc5b212712238ec868fbaaf49df..dd79a784a4300b63999217c12ec3827ad2443a89 100644
--- a/app/bcc1/depsvc/depsvc.cc
+++ b/app/bcc1/depsvc/depsvc.cc
@@ -61,6 +61,6 @@ TASK(CheckedTask) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	dep::release_all_CheckedObjects();
 }
diff --git a/app/bcc1/hoffmann/a.cc b/app/bcc1/hoffmann/a.cc
index 4bb31fd027f923ddd370990c3752565239c5a4de..04018a0750655cb5e2db647c5ce78d18c8682fd1 100644
--- a/app/bcc1/hoffmann/a.cc
+++ b/app/bcc1/hoffmann/a.cc
@@ -82,6 +82,6 @@ TASK(Handler13) {
 
 /****** EOT Task 13 ******/
 
-PreIdleHook() {
+void PreIdleHook() {
 	ShutdownMachine();
 }
diff --git a/app/bcc1/isr2/a.cc b/app/bcc1/isr2/a.cc
index 001fa3147b308d6dfe1c6f014b8881e6b223af89..0ddd222d8a97986f4dcba3efc22df95e7240bf1b 100644
--- a/app/bcc1/isr2/a.cc
+++ b/app/bcc1/isr2/a.cc
@@ -41,7 +41,7 @@ ISR2(ISR1) {
 	test_trace(':');
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/isr2/b.cc b/app/bcc1/isr2/b.cc
index 7c96be8090a6fa456128e6d2785bd9d323677f19..5ce6ec5ff78db8f5318670ed574e5635437ce1d8 100644
--- a/app/bcc1/isr2/b.cc
+++ b/app/bcc1/isr2/b.cc
@@ -42,7 +42,7 @@ ISR2(ISR1) {
 }
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/isr2/c.cc b/app/bcc1/isr2/c.cc
index d0594120dd8e23d99b140da4ac7c4be97c6f49b2..ac8a97f440905c3a77018b80dee34de8e2e32d34 100644
--- a/app/bcc1/isr2/c.cc
+++ b/app/bcc1/isr2/c.cc
@@ -50,7 +50,7 @@ ISR2(ISR1) {
 	test_trace('T');
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/isr2/d.cc b/app/bcc1/isr2/d.cc
index 79dd822fb4139ce7357b364faed55d9bd91e78c2..602650cc7d5fc0d3bed258d2a5afba77d6d84842 100644
--- a/app/bcc1/isr2/d.cc
+++ b/app/bcc1/isr2/d.cc
@@ -40,7 +40,7 @@ ISR2(ISR1) {
 	test_trace('!');
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/isr2/e.cc b/app/bcc1/isr2/e.cc
index 2dcac166595eb2a34078edcc59708523ff39d61e..7649ac277b3cac26c707203bd5a6640cddb1e663 100644
--- a/app/bcc1/isr2/e.cc
+++ b/app/bcc1/isr2/e.cc
@@ -43,7 +43,7 @@ ISR2(ISR1) {
 }
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	static int cycle_count;
 	cycle_count++;
diff --git a/app/bcc1/lukas/alarmstress.cc b/app/bcc1/lukas/alarmstress.cc
index 32c21752cd87bf74e44b4ff43b422cfdb55a89be..f9d3b1b7e2e3f5efac6f6e350a8947fa05d59a07 100644
--- a/app/bcc1/lukas/alarmstress.cc
+++ b/app/bcc1/lukas/alarmstress.cc
@@ -13,7 +13,6 @@ DeclareTask(Task2);
 DeclareTask(Task3);
 DeclareTask(Task4);
 DeclareCounter(C1);
-DeclareAlarm(A0);
 
 void os_main() {
     test_main();
diff --git a/app/bcc1/resource1/a.cc b/app/bcc1/resource1/a.cc
index 3ec257cf77e370545f7d1ed5b3bd08f605ad8d38..89ad08bb0221ce78f8d05e5fc695ae5991b5fb0c 100644
--- a/app/bcc1/resource1/a.cc
+++ b/app/bcc1/resource1/a.cc
@@ -40,7 +40,7 @@ TASK(H5) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("5<>1*");
 	test_finish();
diff --git a/app/bcc1/resource1/b.cc b/app/bcc1/resource1/b.cc
index a74eb4164e2f8992def8d06b2a913ea310e061c0..75ef47e0d70648d66654774ff074a4168c9a4b94 100644
--- a/app/bcc1/resource1/b.cc
+++ b/app/bcc1/resource1/b.cc
@@ -44,7 +44,7 @@ TASK(H5) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("52-<>1*");
 	test_finish();
diff --git a/app/bcc1/resource1/c.cc b/app/bcc1/resource1/c.cc
index 3b2b2ab4ca5f2b8f29c41b7fb5cbd3665644c572..1fc1b8c269355760e88ab0fe3d315e4979b32b4d 100644
--- a/app/bcc1/resource1/c.cc
+++ b/app/bcc1/resource1/c.cc
@@ -47,7 +47,7 @@ TASK(H5) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("5%<>1*%<>1*T");
 	test_finish();
diff --git a/app/bcc1/resource1/d.cc b/app/bcc1/resource1/d.cc
index 915f681e0a60a9fafaeea59b3973ba491cdc4cd4..f653d7a6c2928cbc1e3afafab74dd76125a443fa 100644
--- a/app/bcc1/resource1/d.cc
+++ b/app/bcc1/resource1/d.cc
@@ -59,7 +59,7 @@ TASK(H5) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("5<><>1T{}{}{}2X");
 	test_finish();
diff --git a/app/bcc1/resource1/e.cc b/app/bcc1/resource1/e.cc
index 5ab43b40c97726c92835d152a4685ea6a27af142..b6675281929bfaf107ae1c8064feab63c04e1f64 100644
--- a/app/bcc1/resource1/e.cc
+++ b/app/bcc1/resource1/e.cc
@@ -51,7 +51,7 @@ TASK(H5) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("5<21>34.");
 	test_finish();
diff --git a/app/bcc1/resource1/f.cc b/app/bcc1/resource1/f.cc
index 4b601f9421ec1a3c32164052f7b20136ea46f159..4804e07e46fa9a6e2da1137e890a5023b49e6a28 100644
--- a/app/bcc1/resource1/f.cc
+++ b/app/bcc1/resource1/f.cc
@@ -54,7 +54,7 @@ TASK(H5) {
 	ChainTask(H4);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("4<{1}2>3.");
 	test_finish();
diff --git a/app/bcc1/resource1/g.cc b/app/bcc1/resource1/g.cc
index 6a3834272ec02433462fa28bbf47d710b1148c84..e58d8f6e86f20fcaa30a552a4ea7c3b3ec7cffe6 100644
--- a/app/bcc1/resource1/g.cc
+++ b/app/bcc1/resource1/g.cc
@@ -50,7 +50,7 @@ TASK(H5) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("5(2{}1:).");
 	test_finish();
diff --git a/app/bcc1/resource1/h.cc b/app/bcc1/resource1/h.cc
index 81257cc7276e5dea35bc48d7cbfbfd2bca5a857f..386eff7e292cd0d3a79e7584368d5d6c6946aad3 100644
--- a/app/bcc1/resource1/h.cc
+++ b/app/bcc1/resource1/h.cc
@@ -57,7 +57,7 @@ TASK(H5) {
 	ChainTask(H4);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("54{12}*|4[(1)2]*");
 	test_finish();
diff --git a/app/bcc1/resource1/j.cc b/app/bcc1/resource1/j.cc
index 7bcdfee31c8cff90a57596fb7c33ea9c5bdf1577..bc5d593ee4ffa18e2b0b777c0cc748b3dcaa2884 100644
--- a/app/bcc1/resource1/j.cc
+++ b/app/bcc1/resource1/j.cc
@@ -61,7 +61,7 @@ TASK(H5) {
 	ChainTask(H4);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("54{<1>3}*|4[(1)3]*");
 	test_finish();
diff --git a/app/bcc1/resource1/k.cc b/app/bcc1/resource1/k.cc
index 8647c786d13420a833e4cc71eee21b1d84316095..d01c492621790ea41ea4848afb7ea933c2838236 100644
--- a/app/bcc1/resource1/k.cc
+++ b/app/bcc1/resource1/k.cc
@@ -50,7 +50,7 @@ TASK(H5) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_start_check();
 	test_trace_assert((char *)"5{2}3T");
diff --git a/app/bcc1/resource2/a.cc b/app/bcc1/resource2/a.cc
index 4b4b01a8c848bad5a7f0752dcccf5f8b68f68424..cab07e3a9be680cb6308f0d290a5e445fd1a6272 100644
--- a/app/bcc1/resource2/a.cc
+++ b/app/bcc1/resource2/a.cc
@@ -53,7 +53,7 @@ TASK(H5) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_start_check();
 	test_trace_assert((char *)"5..3*");
diff --git a/app/bcc1/sse1/a.cc b/app/bcc1/sse1/a.cc
index 6b014950e66acd9c7fe600587e3a14ad9b06b1ca..b51b5e9c343e5d63a75e493d9180b6f25b128426 100644
--- a/app/bcc1/sse1/a.cc
+++ b/app/bcc1/sse1/a.cc
@@ -37,7 +37,7 @@ TASK(H5) {
 	ChainTask(H4);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("54+4");
 	test_finish();
diff --git a/app/bcc1/sse1/b.cc b/app/bcc1/sse1/b.cc
index 37f1ff1375e128baa2a7fd2b30720f97e2a8f9a4..ebb55f5b052e2b8de30b3e5f72089031e9e00d15 100644
--- a/app/bcc1/sse1/b.cc
+++ b/app/bcc1/sse1/b.cc
@@ -55,7 +55,7 @@ TASK(H5) {
 	ChainTask(H1);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("51<bB>23|1bB2");
 	test_finish();
diff --git a/app/bcc1/sse1/c.cc b/app/bcc1/sse1/c.cc
index 9356d57112aea4c4b604e33693affc68d8f934a0..e50685883f7f995ca3f99f4718c71ff2e95dfa21 100644
--- a/app/bcc1/sse1/c.cc
+++ b/app/bcc1/sse1/c.cc
@@ -57,7 +57,7 @@ TASK(H5) {
 	ChainTask(H4);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("54{bB23}|4{bB3}");
 	test_finish();
diff --git a/app/bcc1/task1/a.cc b/app/bcc1/task1/a.cc
index 152ed17bd516d2d0bbd975a9a8e1b40ac2a70996..771db772e01020ea356347948d37b52d0f5bf69f 100644
--- a/app/bcc1/task1/a.cc
+++ b/app/bcc1/task1/a.cc
@@ -47,7 +47,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("ab3c2");
 	test_finish();
diff --git a/app/bcc1/task1/b.cc b/app/bcc1/task1/b.cc
index 0fafe86091329b98736e0ee69efaef2bd080655f..7827091ea2d05522fec0c13ca4f0bc200d9e5307 100644
--- a/app/bcc1/task1/b.cc
+++ b/app/bcc1/task1/b.cc
@@ -58,7 +58,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("cdf32");
 	test_finish();
diff --git a/app/bcc1/task1/c.cc b/app/bcc1/task1/c.cc
index db905f6943109012be2a140771446ef3064bb102..a367c660191f30ae3695eefa697bbc82bacae6a7 100644
--- a/app/bcc1/task1/c.cc
+++ b/app/bcc1/task1/c.cc
@@ -56,7 +56,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("1fX3");
 	test_finish();
diff --git a/app/bcc1/task1/d.cc b/app/bcc1/task1/d.cc
index 82b7f40b32e6cbb309be4be880f47bda6f063ebc..591b6c02617abbf658767419fe1381a2919106c0 100644
--- a/app/bcc1/task1/d.cc
+++ b/app/bcc1/task1/d.cc
@@ -62,7 +62,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("12f5Y6X");
 	test_finish();
diff --git a/app/bcc1/task1/e.cc b/app/bcc1/task1/e.cc
index bc65946ef89702c516f133830da43cbf9a9fba8a..eb7ad33760b44744810a09c5a01bb95963198a4b 100644
--- a/app/bcc1/task1/e.cc
+++ b/app/bcc1/task1/e.cc
@@ -44,7 +44,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("a1CDL2CDL3CDLTB");
 	test_finish();
diff --git a/app/bcc1/task1/f.cc b/app/bcc1/task1/f.cc
index 7fed4be74862a49e32180e17ea795ef6bcfe2ec8..2d946de4a96297027e9633c0f64812ff9bb46cbb 100644
--- a/app/bcc1/task1/f.cc
+++ b/app/bcc1/task1/f.cc
@@ -41,7 +41,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("134213421342T");
 	test_finish();
diff --git a/app/bcc1/task1/g.cc b/app/bcc1/task1/g.cc
index 1200e8f51097beaf1428c6a9f395a61463b542d8..499548378b5c66f90e1f88a4c25e6fe837d9e308 100644
--- a/app/bcc1/task1/g.cc
+++ b/app/bcc1/task1/g.cc
@@ -48,7 +48,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("C32C32C321b3C321b3C3");
 	test_finish();
diff --git a/app/bcc1/task2/a.cc b/app/bcc1/task2/a.cc
index c89a6454a8d95fc92711eef5b68b60a56504a71e..60776497e3d9448e082e15b3342665151a7a2d5e 100644
--- a/app/bcc1/task2/a.cc
+++ b/app/bcc1/task2/a.cc
@@ -36,7 +36,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("abc32");
 	test_finish();
diff --git a/app/bcc1/task2/b.cc b/app/bcc1/task2/b.cc
index 3ecc8c1bc2704392735dc5a88c1197cced876ecb..5ae93c3cdc88e27752b9ae794d55d6ef09a107a5 100644
--- a/app/bcc1/task2/b.cc
+++ b/app/bcc1/task2/b.cc
@@ -44,7 +44,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	test_trace_assert("abc32");
 	test_finish();
 	ShutdownMachine();
diff --git a/app/bcc1/task2/c.cc b/app/bcc1/task2/c.cc
index cb2f216f41e7025697e9e9bdc736ac4cbd032efd..3ecfc85150059ad307758026a5ef6ab72ab1645c 100644
--- a/app/bcc1/task2/c.cc
+++ b/app/bcc1/task2/c.cc
@@ -39,7 +39,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("abc32");
 	test_finish();
diff --git a/app/benchmark/a.cc b/app/benchmark/a.cc
index 281710966315849ca3a52437fc29382aa2c3e54e..ed0b4b935ffb7c598c694a5e76511e2fbbada377 100644
--- a/app/benchmark/a.cc
+++ b/app/benchmark/a.cc
@@ -43,7 +43,7 @@ TASK(Handler13) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	test_finish();
 	ShutdownMachine();
 }
diff --git a/app/benchmark/coptermock/dosek.cc b/app/benchmark/coptermock/dosek.cc
index 57839908be043c4efe0b5acfa2d59cdd06eaff27..c2d7d42a282ebf5a0a49775d58dde31b973bfc32 100644
--- a/app/benchmark/coptermock/dosek.cc
+++ b/app/benchmark/coptermock/dosek.cc
@@ -148,6 +148,6 @@ TASK(CopterControlWatchdogTask) {
 }
 
 
-PreIdleHook() {
+void PreIdleHook() {
 	kout << "I" << round << endl;
 }
diff --git a/app/benchmark/zedboard/dosek.cc b/app/benchmark/zedboard/dosek.cc
index f85d1ca7d4c98e47f43f180f61acc82961b85353..f534e34f597b42166b89b2aeef8d63cc13de948a 100644
--- a/app/benchmark/zedboard/dosek.cc
+++ b/app/benchmark/zedboard/dosek.cc
@@ -179,7 +179,7 @@ DeclareResource(RES_SCHEDULER);
 
 #include "dosek-tasks.cc"
 
-FaultDetectedHook() {
+void FaultDetectedHook() {
 	kout << "FFFFFF [[[[[[ DET DET DET ]]]]]]" << endl;
 	kout << "FL DET ";
 	switch (type) {
diff --git a/app/ecc1/event1/a.cc b/app/ecc1/event1/a.cc
index 73e64dbebece883c2c864e6e34021c11f3ee7840..6b31fcd2e8bcdc80d9d3c172af2b4dd0ed518ccb 100644
--- a/app/ecc1/event1/a.cc
+++ b/app/ecc1/event1/a.cc
@@ -48,7 +48,7 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("1[&]}*");
 	test_finish();
diff --git a/app/ecc1/event1/b.cc b/app/ecc1/event1/b.cc
index 683fba86e6c238a9c25e036edb4c80bd6c829d7e..38031b8314168fba0c0205144191e53a80903807 100644
--- a/app/ecc1/event1/b.cc
+++ b/app/ecc1/event1/b.cc
@@ -60,6 +60,6 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 
 }
diff --git a/app/ecc1/event1/c.cc b/app/ecc1/event1/c.cc
index d18ef61d0886814dab877e4b1fdf6314cc173ec0..a7979d33b2eadaf2c29e824c39f2d87eb113fc9a 100644
--- a/app/ecc1/event1/c.cc
+++ b/app/ecc1/event1/c.cc
@@ -43,7 +43,7 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("1[{:}]");
 	test_finish();
diff --git a/app/ecc1/event1/d.cc b/app/ecc1/event1/d.cc
index defa5c90a81d80aa52ac15288ae6cdb3ea0e6220..40bba876f80a038a206967c3848f72fe581e59d5 100644
--- a/app/ecc1/event1/d.cc
+++ b/app/ecc1/event1/d.cc
@@ -44,7 +44,7 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("1.:{}");
 	test_finish();
diff --git a/app/ecc1/event1/e.cc b/app/ecc1/event1/e.cc
index 761c45923e507f2e6756f9fb18224854abad6dc5..f8d753ee04e3e8bd45c6118f24b16df87cfc547e 100644
--- a/app/ecc1/event1/e.cc
+++ b/app/ecc1/event1/e.cc
@@ -52,7 +52,7 @@ TASK(H3) {
 	TerminateTask();
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("1{[.}{](.}{)");
 	test_finish();
diff --git a/app/ecc1/eventisr1/a.cc b/app/ecc1/eventisr1/a.cc
index 2d1c72538057c65d81f990997c1f6ba7cd82e170..33d47aa2ba6cd6f2b5c42a792257b91f3bdd9a63 100644
--- a/app/ecc1/eventisr1/a.cc
+++ b/app/ecc1/eventisr1/a.cc
@@ -50,5 +50,5 @@ ISR2(ISR1) {
 	test_trace('!');
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 }
diff --git a/app/ecc1/eventisr1/b.cc b/app/ecc1/eventisr1/b.cc
index 18fe6218811d9eee5273e1de9961e2e26aa1b8f1..56184a5edfbad7c170ebe759a6e95520f8dee0d4 100644
--- a/app/ecc1/eventisr1/b.cc
+++ b/app/ecc1/eventisr1/b.cc
@@ -50,5 +50,5 @@ ISR2(ISR1) {
 	test_trace('!');
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 }
diff --git a/app/ecc1/eventisr1/c.cc b/app/ecc1/eventisr1/c.cc
index 2ce0bbfc6174657782465b6b8dc1bef667838647..f8cc00a24f5ea764224e3dcc96546a5c590c8143 100644
--- a/app/ecc1/eventisr1/c.cc
+++ b/app/ecc1/eventisr1/c.cc
@@ -55,5 +55,5 @@ ISR2(ISR1) {
 	SetEvent(H1, E2);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 }
diff --git a/app/ecc1/eventisr1/d.cc b/app/ecc1/eventisr1/d.cc
index e2fe7dde02b5a579fd0353083814de5bbc4e727f..a9e3f23bf83a5c38974db49e69d046945ca45e7d 100644
--- a/app/ecc1/eventisr1/d.cc
+++ b/app/ecc1/eventisr1/d.cc
@@ -58,5 +58,5 @@ ISR2(ISR1) {
 	SetEvent(H3, E2);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 }
diff --git a/app/ecc1/eventisr1/e.cc b/app/ecc1/eventisr1/e.cc
index a856c2f4f2dc1e93d303f04abb7935bde2cb80c9..a81d358e0383db89b8aef4a67383ff11dbc564b0 100644
--- a/app/ecc1/eventisr1/e.cc
+++ b/app/ecc1/eventisr1/e.cc
@@ -56,7 +56,7 @@ ISR2(ISR1) {
 	SetEvent(H3, E2);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("13.:{!}>");
 	test_finish();
diff --git a/app/ecc1/eventisr1/f.cc b/app/ecc1/eventisr1/f.cc
index 49f9891cb54a4bbca3d146af3e9d6dd5c90e6e1c..3f42b2607ab9bebfaac6a3cf0644995936f0140b 100644
--- a/app/ecc1/eventisr1/f.cc
+++ b/app/ecc1/eventisr1/f.cc
@@ -59,7 +59,7 @@ ISR2(ISR1) {
 	SetEvent(H3, E2);
 }
 
-PreIdleHook() {
+void PreIdleHook() {
 	/* The testcase has finished, check the output */
 	test_trace_assert("13.:{!}2>");
 	test_finish();
diff --git a/os/hooks.h b/os/hooks.h
index ca2820dbb4bc4e70a4acba22a0c7547b5a38cd53..7b5210f99eeb4f7ffc0f3f88311dc9678acce802 100644
--- a/os/hooks.h
+++ b/os/hooks.h
@@ -19,7 +19,7 @@ EXTERN_C_DECL void __OS_HOOK_PreIdleHook(void);
 EXTERN_C_DECL inlinehint void __OS_HOOK_DEFINED_PreIdleHook(void);
 
 #define PreIdleHook() \
-	void __OS_HOOK_DEFINED_PreIdleHook(void)
+	__OS_HOOK_DEFINED_PreIdleHook(void)
 
 
 
@@ -42,7 +42,7 @@ EXTERN_C_DECL void __OS_HOOK_FaultDetectedHook(DetectedFault_t, uint32_t, uint32
 EXTERN_C_DECL inlinehint void __OS_HOOK_DEFINED_FaultDetectedHook(DetectedFault_t, uint32_t, uint32_t);
 
 #define FaultDetectedHook() \
-	void __OS_HOOK_DEFINED_FaultDetectedHook(DetectedFault_t type, uint32_t arg1, uint32_t arg2)
+	__OS_HOOK_DEFINED_FaultDetectedHook(DetectedFault_t type, uint32_t arg1, uint32_t arg2)
 
 
 #define CALL_HOOK(NAME, ...) __OS_HOOK_ ## NAME (__VA_ARGS__)