diff --git a/todo.txt b/todo.txt
index 933948869..3fa61906a 100644
--- a/todo.txt
+++ b/todo.txt
@@ -57,6 +57,11 @@ N Evaluate if to add a synchronous API to the UART driver, eventually do so.
   them into board.c files, this will remove an ugly dependency.
 * Realign the STM8 port to the new STM8L one as options, naming conventions
   and general solutions.
+X Support for more compilers (IAR, Keil, ARMCMx only initially).
+X Support for not just Makefiles (Ride7, Crossworks etc).
+- Make thread functions return void.
+- Introduce a "THREAD" function prefix in order to hide compiler-specific
+  optimizations for thread functions.
 X Except for the above, bug fixing only until the 2.2.0 release.
 
 Within 2.3.x (hopefully)
@@ -72,8 +77,6 @@ X Shared DMA channels support in the STM32/STM8L HALs.
 X New device driver models: Clock, Systick, RTC, WDG, DAC, USB, Power Monitor.
 - MAC driver for STM32F107 (hardware missing).
 - Device drivers for STM8/STM8L (ADC, PWM, bring them on par with STM32).
-X Support for more compilers (IAR, Keil, ARMCMx only initially).
-X Support for not just Makefiles (Ride7, Crossworks etc).
 - Batch testing of the ARM7/ARMCMx port using OpenOCD, with reports.
 - Debug-related features and tools.
 - Add a *very simple* ADC API for single one shot sampling (implement it as