Add extern "C" to RIOT includes
Fix predicate evaluation
Remove some comments