[CRFIX] Update #include directives