Re-arranged orpl-contiki-conf.h defines