[PATCH] Core: reorder #ifdef in .h file to match order in .c file