NXP-14237: Fixed Category being in header file leading to multiple declaration of category implementation
NXP-14237: Fixed type warning and implicit cast